From e7ccc78b3f0ade890909cfefeceb0e027c4ca91c Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Fri, 18 Sep 2020 14:02:48 +0000
Subject: [PATCH] [Explore|Trunk]

-apply changes for baseLink, domain properties



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@59420 d315682c-612b-4755-9ff5-7f18f6832af3
---
 explore/deploy/beta-properties.json          | 3 ++-
 explore/deploy/production-properties.json    | 3 ++-
 explore/deploy/test-properties.json          | 3 ++-
 explore/src/app/app.component.ts             | 4 ++--
 explore/src/app/home/home.component.ts       | 4 ++--
 explore/src/assets/env-properties.json       | 3 ++-
 explore/src/environments/environment.beta.ts | 5 +++--
 explore/src/environments/environment.prod.ts | 5 +++--
 explore/src/environments/environment.test.ts | 5 +++--
 explore/src/environments/environment.ts      | 5 +++--
 10 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/explore/deploy/beta-properties.json b/explore/deploy/beta-properties.json
index c2cc08bb..cc769225 100644
--- a/explore/deploy/beta-properties.json
+++ b/explore/deploy/beta-properties.json
@@ -66,7 +66,8 @@
   "pagingLimit":  20,
   "resultsPerPage":  10,
 
-  "baseLink" : "https://beta.explore.openaire.eu",
+  "baseLink" : "",
+  "domain": "https://beta.explore.openaire.eu",
 
   "searchLinkToPublication" : "/search/publication?articleId=",
   "searchLinkToProject" : "/search/project?projectId=",
diff --git a/explore/deploy/production-properties.json b/explore/deploy/production-properties.json
index c96e7945..a8f63cde 100644
--- a/explore/deploy/production-properties.json
+++ b/explore/deploy/production-properties.json
@@ -67,7 +67,8 @@
   "pagingLimit":  20,
   "resultsPerPage":  10,
 
-  "baseLink" : "https://explore.openaire.eu",
+  "baseLink" : "",
+  "domain":"https://explore.openaire.eu",
 
   "searchLinkToPublication" : "/search/publication?articleId=",
   "searchLinkToProject" : "/search/project?projectId=",
diff --git a/explore/deploy/test-properties.json b/explore/deploy/test-properties.json
index 1188cfe4..3207bc11 100644
--- a/explore/deploy/test-properties.json
+++ b/explore/deploy/test-properties.json
@@ -66,7 +66,8 @@
   "pagingLimit":  20,
   "resultsPerPage":  10,
 
-  "baseLink" : "https://test.explore.openaire.eu",
+  "baseLink" : "",
+  "domain":"https://test.explore.openaire.eu",
 
   "searchLinkToPublication" : "/search/publication?articleId=",
   "searchLinkToProject" : "/search/project?projectId=",
diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts
index e13e9d0b..039ff265 100644
--- a/explore/src/app/app.component.ts
+++ b/explore/src/app/app.component.ts
@@ -20,8 +20,8 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
 
     <navbar *ngIf="properties" [portal]="properties.dashboard" [properties]=properties [onlyTop]=false [user]="user"
             [communityId]="properties.adminToolsCommunity" [userMenuItems]=userMenuItems [menuItems]=menuItems></navbar>
-    <schema2jsonld  *ngIf="properties" [URL]="properties.baseLink"
-                   [logoURL]="properties.baseLink+'/assets/common-assets/logo-small-explore.png'" type="home"
+    <schema2jsonld  *ngIf="properties" [URL]="properties.domain+properties.baseLink"
+                   [logoURL]="properties.domain+properties.baseLink+'/assets/common-assets/logo-small-explore.png'" type="home"
                    name="OpenAIRE | Find and Share research" description="OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide."></schema2jsonld>
     <div class="custom-main-content">
       <main>
diff --git a/explore/src/app/home/home.component.ts b/explore/src/app/home/home.component.ts
index 4d22afcd..992e1ecd 100644
--- a/explore/src/app/home/home.component.ts
+++ b/explore/src/app/home/home.component.ts
@@ -203,11 +203,11 @@ export class HomeComponent {
     this.subs.push(this.route.data
      .subscribe((data: { envSpecific: EnvProperties }) => {
         this.properties = data.envSpecific;
-        this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this._router.url, false);
+        this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink+this._router.url, false);
        this.getPageContents();
 
        if(this.properties!=null){
-          var url = this.properties.baseLink+this._router.url;
+          var url = this.properties.domain + this.properties.baseLink+this._router.url;
           this._meta.updateTag({content:url},"property='og:url'");
           if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
             this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
diff --git a/explore/src/assets/env-properties.json b/explore/src/assets/env-properties.json
index 5c4a889a..33aebf57 100644
--- a/explore/src/assets/env-properties.json
+++ b/explore/src/assets/env-properties.json
@@ -65,7 +65,8 @@
   "pagingLimit":  20,
   "resultsPerPage":  10,
 
-  "baseLink" : "https://beta.explore.openaire.eu",
+  "baseLink" : "",
+  "domain":"https://beta.explore.openaire.eu",
 
   "searchLinkToPublication" : "/search/publication?articleId=",
   "searchLinkToProject" : "/search/project?projectId=",
diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts
index 7492a309..a70d52db 100644
--- a/explore/src/environments/environment.beta.ts
+++ b/explore/src/environments/environment.beta.ts
@@ -68,8 +68,9 @@ export let properties: EnvProperties = {
   csvLimit: 2000,
   pagingLimit: 20,
   resultsPerPage: 10,
-  
-  baseLink: "https://beta.explore.openaire.eu",
+
+  "baseLink" : "/",
+  "domain":"https://beta.explore.openaire.eu",
   
   searchLinkToResult: "/search/result?id=",
   searchLinkToPublication: "/search/publication?articleId=",
diff --git a/explore/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts
index 8e59dc72..0ff89e23 100644
--- a/explore/src/environments/environment.prod.ts
+++ b/explore/src/environments/environment.prod.ts
@@ -69,8 +69,9 @@ export let properties: EnvProperties = {
   csvLimit: 2000,
   pagingLimit: 20,
   resultsPerPage: 10,
-  
-  baseLink: "https://explore.openaire.eu",
+
+  "baseLink" : "/",
+  "domain": "https://explore.openaire.eu",
   
   searchLinkToResult: "/search/result?id=",
   searchLinkToPublication: "/search/publication?articleId=",
diff --git a/explore/src/environments/environment.test.ts b/explore/src/environments/environment.test.ts
index 423c9a80..c9d691e5 100644
--- a/explore/src/environments/environment.test.ts
+++ b/explore/src/environments/environment.test.ts
@@ -68,8 +68,9 @@ export let properties: EnvProperties = {
   csvLimit: 2000,
   pagingLimit: 20,
   resultsPerPage: 10,
-  
-  baseLink: "https://test.explore.openaire.eu",
+
+  "baseLink" : "/",
+  "domain": "https://test.explore.openaire.eu",
   
   searchLinkToResult: "/search/result?id=",
   searchLinkToPublication: "/search/publication?articleId=",
diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts
index 82b57d2a..d80edeae 100644
--- a/explore/src/environments/environment.ts
+++ b/explore/src/environments/environment.ts
@@ -72,8 +72,9 @@ export let properties: EnvProperties = {
   csvLimit: 2000,
   pagingLimit: 20,
   resultsPerPage: 10,
-  
-  baseLink: "https://beta.explore.openaire.eu",
+
+  "baseLink" : "",
+  "domain": "https://beta.explore.openaire.eu",
   
   searchLinkToResult: "/search/result?id=",
   searchLinkToPublication: "/search/publication?articleId=",