From 0681ad95ece23f84c376892bbcc585e6b5f82e79 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Tue, 30 Jun 2020 10:32:32 +0000 Subject: [PATCH] [Admin tool|Trunk] update properties use new stats tool for charts package.json: add clean up after build git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@59025 d315682c-612b-4755-9ff5-7f18f6832af3 --- deploy/beta-properties.json | 10 +++++----- package.json | 7 ++++--- src/app/pages/stats/stats.component.ts | 2 +- src/assets/env-properties.json | 6 +++--- src/environments/environment.beta.ts | 8 ++++---- src/environments/environment.ts | 4 ++-- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/deploy/beta-properties.json b/deploy/beta-properties.json index 627d4d6..e89e8de 100644 --- a/deploy/beta-properties.json +++ b/deploy/beta-properties.json @@ -7,8 +7,8 @@ "claimsAPIURL": "https://beta.services.openaire.eu/claims/rest/claimsService/", "statisticsAPIURL": "https://beta.services.openaire.eu/stats-api/", "statisticsFrameAPIURL": "https://beta.openaire.eu/stats/", - "statisticsFrameNewAPIURL": "http://marilyn.athenarc.gr:8080/stats-api/", - "useNewStatistisTool": false, + "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=", @@ -38,7 +38,7 @@ "userInfoUrl": "https://beta.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": "openaire.test@gmail.com", + "feedbackmail": "feedback@openaire.eu", "feedbackmailForMissingEntities": "feedback@openaire.eu", "cacheUrl": "https://demo.openaire.eu/cache/get?url=", "adminToolsAPIURL": "https://beta.services.openaire.eu/uoa-admin-tools/", @@ -79,8 +79,8 @@ "showLastIndexInformationLink": false, "widgetLink": "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", "claimsInformationLink": "https://beta.openaire.eu/linking", - "lastIndexUpdate": "2019-11-01", - "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/", + "lastIndexUpdate": "2020-05-06", + "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/", "adminPortalURL": "https://beta.admin.connect.openaire.eu", "admins" : ["rcd-helpdesk@openaire.eu"] } diff --git a/package.json b/package.json index d838325..d865430 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,12 @@ "scripts": { "ng": "ng", "start": "ng serve --host 0.0.0.0 --disable-host-check --port=5000", - "build": "ng build --prod", - "build-beta": "ng build --configuration=beta", + "build": "ng build --prod; npm run after-build-clean", + "build-beta": "ng build --configuration=beta; npm run after-build-clean", "test": "ng test", "lint": "ng lint", - "e2e": "ng e2e" + "e2e": "ng e2e", + "after-build-clean": "rm -rf dist/assets/common-assets/.svn/ dist/assets/connect-assets/.svn/" }, "private": true, "dependencies": { diff --git a/src/app/pages/stats/stats.component.ts b/src/app/pages/stats/stats.component.ts index 294027c..8b4e30d 100644 --- a/src/app/pages/stats/stats.component.ts +++ b/src/app/pages/stats/stats.component.ts @@ -136,7 +136,7 @@ export class StatsComponent implements OnInit { this.configService.getCommunityInformation(this.properties, this.communityId).subscribe( res => { this.communityInfo = res; - this.communityName = this.communityInfo.shortTitle; + this.communityName = this.communityInfo.name; }, error => this.handleError('Failed to retrieve information for the chosen community!', error),//console.log(error), () => { diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json index 2653809..dd4d7c7 100644 --- a/src/assets/env-properties.json +++ b/src/assets/env-properties.json @@ -7,8 +7,8 @@ "claimsAPIURL" : "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", - "statisticsFrameNewAPIURL": "http://marilyn.athenarc.gr:8080/stats-api/", - "useNewStatistisTool":false, + "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=", @@ -47,7 +47,7 @@ "feedbackmailForMissingEntities" :"feedback@openaire.eu", "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=", - "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/", + "adminToolsAPIURL" :"http://dl170.madgik.di.uoa.gr:8080/uoa-admin-tools/", "adminToolsCommunity" :"openaire", "communityAPI": "https://dev-openaire.d4science.org/openaire/community/", diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 4dfc853..14501a5 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -9,8 +9,8 @@ export let properties: EnvProperties = { claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", - statisticsFrameNewAPIURL: "http://marilyn.athenarc.gr:8080/stats-api/", - useNewStatistisTool: false, + 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=", @@ -40,7 +40,7 @@ export let properties: EnvProperties = { userInfoUrl: "https://beta.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: "openaire.test@gmail.com", + feedbackmail: "feedback@openaire.eu", feedbackmailForMissingEntities: "feedback@openaire.eu", cacheUrl: "https://demo.openaire.eu/cache/get?url=", adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/", @@ -78,7 +78,7 @@ export let properties: EnvProperties = { showLastIndexInformationLink: false, widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", claimsInformationLink: "https://beta.openaire.eu/linking", - lastIndexUpdate: "2019-11-01", + lastIndexUpdate: "2020-05-06", indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/", adminPortalURL: "https://beta.admin.connect.openaire.eu", admins: ["rcd-helpdesk@openaire.eu"] diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 0a79897..5ef6572 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -14,8 +14,8 @@ export let properties: EnvProperties = { claimsAPIURL: 'http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/', statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/', statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/', - statisticsFrameNewAPIURL: 'http://marilyn.athenarc.gr:8080/stats-api/', - useNewStatistisTool: false, + 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=',