diff --git a/app.component.ts b/app.component.ts index c97126d8..849ab411 100644 --- a/app.component.ts +++ b/app.component.ts @@ -14,7 +14,7 @@ import{MenuItem,RootMenuItem} from './sharedComponents/menu'; `], template: ` -

Openaire Lib Component

@@ -41,7 +41,7 @@ import{MenuItem,RootMenuItem} from './sharedComponents/menu'; - + ` diff --git a/services/organization.service.ts b/services/organization.service.ts index 6ee79c84..69b5083c 100644 --- a/services/organization.service.ts +++ b/services/organization.service.ts @@ -17,8 +17,6 @@ export class OrganizationService { getOrganizationInfo (id: string, properties:EnvProperties):any { console.info("getOrganizationInfo in service"); let url = properties.searchAPIURLLAst+'resources?format=json&query=( (oaftype exact organization) and (reldatasourcecompatibilityid=driver or reldatasourcecompatibilityid=driver-openaire2.0 or reldatasourcecompatibilityid=openaire2.0 or reldatasourcecompatibilityid=openaire3.0 or reldatasourcecompatibilityid=openaire2.0_data or reldatasourcecompatibilityid=hostedBy or relprojectid=* or reldatasourcecompatibilityid = native)) and ( objIdentifier ='+id+')'; - //let url = "http://beta.services.openaire.eu:8480/search/rest/v2/api/resources?format=json&query=(%20(oaftype%20exact%20organization)%20and%20(reldatasourcecompatibilityid=driver%20or%20reldatasourcecompatibilityid=driver-openaire2.0%20or%20reldatasourcecompatibilityid=openaire2.0%20or%20reldatasourcecompatibilityid=openaire3.0%20or%20reldatasourcecompatibilityid=openaire2.0_data%20or%20reldatasourcecompatibilityid=hostedBy%20or%20relprojectid=*))%20and%20(%20objIdentifier%20=dedup_wf_001%3A%3Af1e63493def7cedfa5b497cdbea26faa)"; - return this.http.get((properties.useCache)? (properties.cacheUrl +encodeURIComponent(url)): url) .map(res => res.json()) diff --git a/sharedComponents/bottom.component.html b/sharedComponents/bottom.component.html index e985c5a2..08d011b8 100644 --- a/sharedComponents/bottom.component.html +++ b/sharedComponents/bottom.component.html @@ -95,9 +95,9 @@

Dashboards

diff --git a/sharedComponents/bottom.component.ts b/sharedComponents/bottom.component.ts index 2e9106c1..59bd3561 100644 --- a/sharedComponents/bottom.component.ts +++ b/sharedComponents/bottom.component.ts @@ -16,15 +16,10 @@ export class BottomComponent { @Input() showDnet:boolean = true; @Input() assetsPath:string ='assets/common-assets/'; @Input() menuItems:MenuItem []; -// [ -// new MenuItem("","About","https://beta.openaire.eu/project-factsheets","",false,[],[],{}), -// // new MenuItem("","Services","","",false,[],[],{}), -// new MenuItem("","News - Events","https://beta.openaire.eu/news-events","",false,[],[],{}), -// new MenuItem("","Blog","https://blogs.openaire.eu/","",false,[],[],{}), -// new MenuItem("","Contact us","https://beta.openaire.eu/contact-us","",false,[],[],{}) -// ]; + @Input() APIUrl; @Input() communityId; +@Input() environment:string = "beta"; showPage ={}; constructor(private config: ConfigurationService, private route: ActivatedRoute,) { } diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index d557c339..3dcca21d 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -10,7 +10,7 @@ - @@ -34,9 +34,9 @@
  • Dashboards @@ -83,12 +83,12 @@
    @@ -115,7 +115,7 @@
    {{community.name}}
    - - diff --git a/sharedComponents/navigationBar.component.ts b/sharedComponents/navigationBar.component.ts index d4b0c758..ea12f273 100644 --- a/sharedComponents/navigationBar.component.ts +++ b/sharedComponents/navigationBar.component.ts @@ -25,6 +25,7 @@ export class NavigationBarComponent { @Input() community: {id:string, name:string, logoUrl:string}; @Input() showMenu:boolean = true; @Input() homeurl:boolean = true; + @Input() environment:string = "beta"; public isAuthorized: boolean = false; sub:any; diff --git a/utils/piwik/piwik.service.ts b/utils/piwik/piwik.service.ts index 6aeb8b49..589c53ef 100644 --- a/utils/piwik/piwik.service.ts +++ b/utils/piwik/piwik.service.ts @@ -19,8 +19,6 @@ export class PiwikService { var ua = this.getUserAgent(); var referrer = this.getReferrer(); - console.log("Piwik - id: " + siteId); - if(typeof location !== 'undefined'){ var url = properties.piwikBaseUrl+((siteId!=null)?siteId:properties.piwikSiteId)+"&rec=1&url="+StringUtils.URIEncode(location.href)+"&action_name="+StringUtils.URIEncode(title)+ ((ua != null && ua.length > 0)?('&ua='+StringUtils.URIEncode(ua)):'')+ diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index 48b1048a..9968f013 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; export class EnvProperties { - productionMode:boolean; + environment:boolean; //{beta,test,prod} enablePiwikTrack:boolean ; enableHelper:boolean; useCache:boolean ; @@ -14,7 +14,7 @@ export class EnvProperties { loginAPIURL; - claimsAPIURL;; + claimsAPIURL; searchAPIURLLAst;