Fix monitor properties for admin tools api. Update library

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit afcd7fc3c3621a9f65663076c34216a7a45f4b25
+Subproject commit 045665ae107501603df4ad02ed95c9842c9c8a3e

src/environments/environment.beta.ts

@@ -36,38 +36,29 @@ 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",
   utilsService: "https://demo.openaire.eu/utils-service",
-  
   vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
-  
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "298",
+  registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
   loginUrl :"https://beta.services.openaire.eu/monitor-login/openid_connect_login",
   userInfoUrl : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
-
-
   logoutUrl: "https://beta.services.openaire.eu/monitor-login/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/",
-  adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools",
   adminToolsCommunity: "monitor",
+  adminToolsPortalType: "monitor",
   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 : "",
-  "baseLink" : "",
+  domain : "https://beta.monitor.openaire.eu",
-  "domain" : "https://beta.monitor.openaire.eu",
   searchLinkToResult: "/search/result?id=",
   searchLinkToPublication: "/search/publication?articleId=",
   searchLinkToProject: "/search/project?projectId=",
@@ -76,7 +67,6 @@ export let properties: EnvProperties = {
   searchLinkToSoftwareLanding: "/search/software?softwareId=",
   searchLinkToOrganization: "/search/organization?organizationId=",
   searchLinkToOrp: "/search/other?orpId=",
-  
   searchLinkToStakeholders: "/browse",
   searchLinkToResults: "/search/find/research-outcomes",
   searchLinkToDataProviders: "/search/find/dataproviders",
@@ -87,24 +77,18 @@ export let properties: EnvProperties = {
   searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table",
   searchLinkToJournals: "/search/journals",
   searchLinkToJournalsTable: "/search/journals-table",
-  
   searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
   searchLinkToAdvancedProjects: "/search/advanced/projects",
   searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
   searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
-  
   lastIndexInformationLink: "https://beta.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",
-  
   depositLearnHowPage: "/participate/deposit/learn-how",
   depositSearchPage: "/participate/deposit/search",
   shareInZenodoPage: "/participate/deposit/zenodo",
-  
   reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
-  
   admins: ["feedback@openaire.eu"],
   lastIndexUpdate: "2019-08-07",
   indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",

src/environments/environment.prod.ts

@@ -39,6 +39,7 @@ export let properties: EnvProperties = {
   vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "104",
+  registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
   loginUrl: "https://services.openaire.eu/monitor-login/openid_connect_login",
   userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
   logoutUrl: "https://services.openaire.eu/monitor-login/openid_logout",
@@ -47,7 +48,8 @@ export let properties: EnvProperties = {
   cacheUrl: "https://explore.openaire.eu/cache/get?url=",
   datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
   monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
-  adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
+  adminToolsAPIURL: "https://services.openaire.eu/uoa-monitor-service/",
+  adminToolsPortalType: "monitor",
   adminToolsCommunity: "monitor",
   contextsAPI: "https://services.openaire.eu/openaire/context",
   communityAPI: "https://services.openaire.eu/openaire/community/",
@@ -55,8 +57,8 @@ export let properties: EnvProperties = {
   csvLimit: 2000,
   pagingLimit: 20,
   resultsPerPage: 10,
-  "baseLink" : "",
+  baseLink : "",
-  "domain" : "https://monitor.openaire.eu",
+  domain : "https://monitor.openaire.eu",
   searchLinkToResult: "/search/result?id=",
   searchLinkToPublication: "/search/publication?articleId=",
   searchLinkToProject: "/search/project?projectId=",
@@ -65,7 +67,6 @@ export let properties: EnvProperties = {
   searchLinkToSoftwareLanding: "/search/software?softwareId=",
   searchLinkToOrp: "/search/other?orpId=",
   searchLinkToOrganization: "/search/organization?organizationId=",
-  
   searchLinkToStakeholders: "/browse",
   searchLinkToResults: "/search/find/research-outcomes",
   searchLinkToDataProviders: "/search/find/dataproviders",

src/environments/environment.ts

@@ -1,8 +1,3 @@
-// The file contents for the current environment will overwrite these during build.
-// The build system defaults to the dev environment which uses `environment.ts`, but if you do
-// `ng build --env=prod` then `environment.prod.ts` will be used instead.
-// 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";
 
 export let properties: EnvProperties = {
@@ -45,15 +40,15 @@ export let properties: EnvProperties = {
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "298",
   registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
-  loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
+  loginUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
   userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
-  /*logoutUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_logout",*/
+  logoutUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_logout",
-  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
   cookieDomain: ".di.uoa.gr",
   feedbackmail: "openaire.test@gmail.com",
   cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
   monitorServiceAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service",
-  adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
+  adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/",
+  adminToolsPortalType: "monitor",
   adminToolsCommunity: "monitor",
   datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
   contextsAPI: "https://dev-openaire.d4science.org/openaire/context",
@@ -62,8 +57,8 @@ export let properties: EnvProperties = {
   csvLimit: 2000,
   pagingLimit: 20,
   resultsPerPage: 10,
-  "baseLink" : "",
+  baseLink : "",
-  "domain" : "http://dl170.madgik.di.uoa.gr/monitor",
+  domain : "http://dl170.madgik.di.uoa.gr/monitor",
   searchLinkToResult: "/search/result?id=",
   searchLinkToPublication: "/search/publication?articleId=",
   searchLinkToProject: "/search/project?projectId=",