diff --git a/dashboard/divhelpcontent/div-help-contents.component.ts b/dashboard/divhelpcontent/div-help-contents.component.ts index f509d1b5..1f17f90d 100644 --- a/dashboard/divhelpcontent/div-help-contents.component.ts +++ b/dashboard/divhelpcontent/div-help-contents.component.ts @@ -112,7 +112,7 @@ export class DivHelpContentsComponent implements OnInit { this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl": this.properties.baseLink + this.router.url + "redirectUrl": this.properties.domain + this.properties.baseLink + this.router.url } }); } else { @@ -140,7 +140,7 @@ export class DivHelpContentsComponent implements OnInit { this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl": this.properties.baseLink + this.router.url + "redirectUrl": this.properties.domain + this.properties.baseLink + this.router.url } }); } else { @@ -180,7 +180,7 @@ export class DivHelpContentsComponent implements OnInit { this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl":this.properties.baseLink + this.router.url + "redirectUrl":this.properties.domain + this.properties.baseLink + this.router.url } }); } else { @@ -246,7 +246,7 @@ export class DivHelpContentsComponent implements OnInit { this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl":this.properties.baseLink + this.router.url + "redirectUrl":this.properties.domain + this.properties.baseLink + this.router.url } }); } else { @@ -264,7 +264,7 @@ export class DivHelpContentsComponent implements OnInit { this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, - "redirectUrl": this.properties.baseLink + this.router.url + "redirectUrl": this.properties.domain + this.properties.baseLink + this.router.url } }); } else { diff --git a/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts b/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts index b51193c4..fd4c2ec0 100644 --- a/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts +++ b/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts @@ -44,7 +44,9 @@ export class OpenAireJsonldConverterService { searchPage["@type"] = "Website"; searchPage["name"] = name; searchPage["url"] = URL + searchRoute; - searchPage["logo"] = logoURL; + if(logoURL && logoURL.length > 0 ) { + searchPage["logo"] = logoURL; + } if (description) { searchPage["description"] = description; } diff --git a/utils/piwik/previousRouteRecorder.guard.ts b/utils/piwik/previousRouteRecorder.guard.ts index 13de182e..8d74e23f 100644 --- a/utils/piwik/previousRouteRecorder.guard.ts +++ b/utils/piwik/previousRouteRecorder.guard.ts @@ -12,7 +12,7 @@ export class PreviousRouteRecorder implements CanDeactivate { } canDeactivate(component: any): Observable | boolean { if (typeof localStorage !== 'undefined') { - // console.log("In PreviousRouteRecorder : "properties.domain +properties.baseLink + this.router.url ); + console.log("In PreviousRouteRecorder : " + properties.domain +properties.baseLink + this.router.url ); localStorage.setItem('previousRoute', properties.domain + properties.baseLink + this.router.url); } return true; diff --git a/utils/properties/environment-specific.service.ts b/utils/properties/environment-specific.service.ts index 5bad9a99..dbe06867 100644 --- a/utils/properties/environment-specific.service.ts +++ b/utils/properties/environment-specific.service.ts @@ -7,6 +7,7 @@ import {REQUEST} from '@nguniversal/express-engine/tokens'; import {EnvProperties} from './env-properties'; import {properties} from "../../../../environments/environment"; +import {ConnectHelper} from "../../connect/connectHelper"; @Injectable() export class EnvironmentSpecificService { @@ -17,7 +18,11 @@ export class EnvironmentSpecificService { constructor(private http: HttpClient, @Optional() @Inject(REQUEST) private request: Request) { if(properties.adminToolsCommunity == "connect") { - properties.domain = "https://" + this.getDomain(); + if(properties.environment == "development"){ + properties.domain = "https://beta."+(ConnectHelper.getCommunityFromDomain(properties.domain)?ConnectHelper.getCommunityFromDomain(properties.domain):"connect")+".openaire.eu"; + }else{ + properties.domain = "https://" + this.getDomain(); + } } }