MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 15 Wiki Activity

[Monitor|Trunk] 

- update user menu items
- remove unused page helptexts calls
-update properties


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@59773 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Argiro Kokogiannaki 2020-11-04 17:19:27 +00:00
parent 5c43afcd9e
commit a8ddd2f65a
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/app.component.ts
View File

@ -122,12 +122,12 @@ export class AppComponent {
public setUserMenu() { public setUserMenu() {
this.userMenuItems = []; this.userMenuItems = [];
if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user) || Session.isCommunityCurator(this.user)) { if (this.user) {
/*this.userMenuItems.push(new MenuItem("", "Manage Helptexts", if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user) || Session.isKindOfMonitorManager(this.user)) {
((this.properties.environment == "production") ? "https://admin.explore.openaire.eu" : "https://beta.admin.connect.openaire.eu") + "/dashboard?communityId=connect", this.userMenuItems.push(new MenuItem("", "Manage profiles",
"", false, [], [], {}))*/ this.properties.domain + properties.baseLink + "/dashboard/admin", "", false, [], [], {}))
this.userMenuItems.push(new MenuItem("", "Manage Stakeholders", }
this.properties.domain + properties.baseLink + "/dashboard/admin", "", true, [], [], {})) this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
} }
} }
} }

2
src/app/contact/contact.component.ts
View File

@ -62,7 +62,7 @@ export class ContactComponent implements OnInit {
this.updateDescription("OpenAIRE - Monitor, Community Gateway, research community - Contact Us"); this.updateDescription("OpenAIRE - Monitor, Community Gateway, research community - Contact Us");
this.reset(); this.reset();
//this.getDivContents(); //this.getDivContents();
this.getPageContents(); // this.getPageContents();
HelperFunctions.scroll(); HelperFunctions.scroll();
this.showLoading = false; this.showLoading = false;
}); });

2
src/app/home/home.component.ts
View File

@ -127,7 +127,7 @@ export class HomeComponent {
this.getStakeholders(); this.getStakeholders();
// this.createGifs(); // this.createGifs();
//this.getDivContents(); //this.getDivContents();
this.getPageContents(); // this.getPageContents();
this.localStorageService.get().subscribe(value => { this.localStorageService.get().subscribe(value => {
this.directLink = value; this.directLink = value;
}); });

1
src/environments/environment.prod.ts
View File

@ -40,6 +40,7 @@ export let properties: EnvProperties = {
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
piwikSiteId: "104", piwikSiteId: "104",
loginUrl: "https://services.openaire.eu/monitor-login/openid_connect_login", loginUrl: "https://services.openaire.eu/monitor-login/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=", logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
cookieDomain: ".openaire.eu", cookieDomain: ".openaire.eu",
feedbackmail: "feedback@openaire.eu", feedbackmail: "feedback@openaire.eu",

8
src/environments/environment.ts
View File

@ -45,12 +45,10 @@ export let properties: EnvProperties = {
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
piwikSiteId: "80", piwikSiteId: "80",
registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login", loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',
/*loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/ /*logoutUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_logout",*/
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
cookieDomain: ".di.uoa.gr", cookieDomain: ".di.uoa.gr",
feedbackmail: "openaire.test@gmail.com", feedbackmail: "openaire.test@gmail.com",
cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=", cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",