From 44427dba5fe2e4da8a22a9f6b2d66edc7eb2db12 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 14 Oct 2022 14:59:36 +0300 Subject: [PATCH] Fix change status of stakeholder and indicator. Add new APIs in development environment. --- .../manageStakeholders.component.html | 2 +- .../manageStakeholders.component.ts | 4 ++-- src/app/openaireLibrary | 2 +- src/app/topic/indicators.component.html | 2 +- src/app/topic/indicators.component.ts | 4 ++-- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- src/environments/environment.ts | 12 ++++++------ 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html index 959a0f5..4283b69 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.html +++ b/src/app/manageStakeholders/manageStakeholders.component.html @@ -76,7 +76,7 @@
  • - +
    {{v.label}} diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts index c3ea4fb..3b77a8d 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.ts +++ b/src/app/manageStakeholders/manageStakeholders.component.ts @@ -251,8 +251,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { let path = [ stakeholder._id ]; - this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => { - stakeholder.visibility = visibility; + this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(returnedElement => { + stakeholder.visibility = returnedElement.visibility; UIkit.notification(stakeholder.name+ '\'s status has been successfully changed to ' + stakeholder.visibility.toLowerCase(), { status: 'success', timeout: 6000, diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 032b91a..ea935df 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 032b91ae7a78ccad72a3a02a9463f6df5d00d223 +Subproject commit ea935df5b762501f16b8c214dc311b2155b549f4 diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index a09ab70..71e129d 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -50,7 +50,7 @@
  • - +
    {{v.label}} diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts index 07a1546..55e0716 100644 --- a/src/app/topic/indicators.component.ts +++ b/src/app/topic/indicators.component.ts @@ -1029,8 +1029,8 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV sectionId, indicator._id ]; - this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => { - indicator.visibility = visibility; + this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(returnedElement => { + indicator.visibility = returnedElement.visibility; UIkit.notification('Indicator has been successfully changed to ' + indicator.visibility.toLowerCase(), { status: 'success', timeout: 6000, diff --git a/src/assets/common-assets b/src/assets/common-assets index 14655ae..2de3f62 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 14655ae3aa7a50162ef218428a0ccdee35c1aa7b +Subproject commit 2de3f625b772a264acb0579126b2bfce42778d0c diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index bc0edde..f902074 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit bc0edde68dccfc17c1abc5d5aa3721f720aee852 +Subproject commit f902074e00e01165f489e2fef12aad6551c03ccd diff --git a/src/environments/environment.ts b/src/environments/environment.ts index c4075db..e9df506 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -55,16 +55,16 @@ export let properties: EnvProperties = { 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:8080/login-service/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo", - logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout", + 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: "https://services.openaire.eu/uoa-monitor-service", - monitorServiceAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service", - adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/", - notificationsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/notification/", + 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/",