diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts
index 41f77ea3..5b22f4ce 100644
--- a/explore/src/app/app.component.ts
+++ b/explore/src/app/app.component.ts
@@ -88,7 +88,7 @@ export class AppComponent {
if (typeof document !== 'undefined') {
this.isClient = true;
}
- this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
+ this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
this.feedbackmail = this.properties.feedbackmail;
if (this.properties.environment == "production" || this.properties.environment == "development") {
this.subscriptions.push(this.route.queryParams.subscribe(data => {
diff --git a/explore/src/app/contact/contact.component.ts b/explore/src/app/contact/contact.component.ts
index 0549f948..410d9a18 100644
--- a/explore/src/app/contact/contact.component.ts
+++ b/explore/src/app/contact/contact.component.ts
@@ -60,10 +60,7 @@ export class ContactComponent implements OnInit {
this.properties = properties;
this.email = {body: '', subject: '', recipients: []};
-
- if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.subscriptions.push( this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
- }
+ this.subscriptions.push( this._piwikService.trackView(this.properties, this.pageTitle).subscribe());
this.url = this.properties.domain + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url);
this.updateUrl(this.url);
diff --git a/explore/src/app/fos/fos.component.ts b/explore/src/app/fos/fos.component.ts
index f6a6081c..4c85da4f 100644
--- a/explore/src/app/fos/fos.component.ts
+++ b/explore/src/app/fos/fos.component.ts
@@ -4,12 +4,8 @@ import {properties} from "../../environments/environment";
@Component({
selector: 'explore-fos',
template: `
-
+
`
})
-export class ExploreFosComponent {
- piwikSiteId = properties.piwikSiteId;
-
- constructor() {}
-}
\ No newline at end of file
+export class ExploreFosComponent {}
diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts
index b3b44da3..ef4276c2 100644
--- a/explore/src/app/funders/funders.component.ts
+++ b/explore/src/app/funders/funders.component.ts
@@ -63,9 +63,7 @@ export class FundersComponent implements OnInit {
ngOnInit() {
this.title.setTitle('OpenAIRE - Explore | Funders');
this.properties = properties;
- if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.subscriptions.push( this.piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
- }
+ this.subscriptions.push( this.piwikService.trackView(this.properties, this.pageTitle).subscribe());
this.url = this.properties.domain + this.router.url;
this.seoService.createLinkForCanonicalURL(this.url);
this.updateUrl(this.url);
diff --git a/explore/src/app/home/home.component.ts b/explore/src/app/home/home.component.ts
index 5f02eba6..43913515 100644
--- a/explore/src/app/home/home.component.ts
+++ b/explore/src/app/home/home.component.ts
@@ -213,9 +213,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
if (this.properties != null) {
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.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
- }
+ this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
if(this.numbersComponent) {
this.numbersComponent.showPublications = false;
this.numbersComponent.showDatasets = false;
@@ -225,7 +223,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
this.numbersComponent.showDataProviders = false;
this.numbersComponent.showOrganizations = false;
}
- this.subscriptions.push(this.config.communityInformationState.subscribe(data => {
+ this.subscriptions.push(this.config.portalAsObservable.subscribe(data => {
if(data) {
var showEntity = {};
for (var i = 0; i < data['entities'].length; i++) {
diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary
index 870ce718..78f87e61 160000
--- a/explore/src/app/openaireLibrary
+++ b/explore/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 870ce718972596f5c36ae79271927c7f4279ff58
+Subproject commit 78f87e61bb57adbc7c7cc58c57a97948309a3853
diff --git a/explore/src/app/sdg/sdg.component.ts b/explore/src/app/sdg/sdg.component.ts
index 7c90088a..2f78b9e7 100644
--- a/explore/src/app/sdg/sdg.component.ts
+++ b/explore/src/app/sdg/sdg.component.ts
@@ -4,12 +4,7 @@ import {properties} from "../../environments/environment";
@Component({
selector: 'explore-sdg',
template: `
-
+
`
})
-export class ExploreSdgComponent {
- piwikSiteId = properties.piwikSiteId;
-
- constructor() {
- }
-}
\ No newline at end of file
+export class ExploreSdgComponent {}
diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets
index fda17bc4..2fd57843 160000
--- a/explore/src/assets/common-assets
+++ b/explore/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit fda17bc450a93400ebd070ff358b2b19a936ecae
+Subproject commit 2fd57843f85125e54adfb95b35776755037ea359