Change piwik base on the new dynamic piwik.

src/app/app-routing.module.ts

@@ -120,7 +120,7 @@ export class AppRoutingModule {
     }
   }
   constructor( private config: ConfigurationService, private router: Router){
-    this.subs.push(this.config.communityInformationState.subscribe(data => {
+    this.subs.push(this.config.portalAsObservable.subscribe(data => {
         if (data) {
           if (data['pages']) {
             for (var i = 0; i < data['pages'].length; i++) {

src/app/app.component.ts

@@ -51,7 +51,7 @@ export class AppComponent {
               @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2,  private router: Router, private route: ActivatedRoute) {
     this.agg = PortalAggregators.eoscInfo;
     this.setStyles();
-    this.configurationService.initStaticCommunityInformation(PortalAggregators.getCommunityInfo());
+    this.configurationService.initStaticPortal(PortalAggregators.getCommunityInfo());
     this.showHeader = this.agg.showHeaderAlways;
   }
 

src/app/claims/directLinking/directLinking.component.ts

@@ -4,9 +4,7 @@ import {properties} from "../../../environments/environment";
 @Component({
   selector: 'openaire-directLinking',
   template: `
-    <directLinking [piwikSiteId]="piwikSiteId"></directLinking>`
+    <directLinking></directLinking>`
 })
 export class OpenaireDirectLinkingComponent {
-  piwikSiteId = properties.piwikSiteId;
-
 }

src/app/claims/linking/linkingGeneric.component.ts

@@ -3,11 +3,8 @@ import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-linking-generic',
-    template: `<linking-generic pageTitle="Linking" [piwikSiteId]="piwikSiteId"></linking-generic>`
+    template: `<linking-generic pageTitle="Linking"></linking-generic>`
 
 })
 export class OpenaireLinkingComponent {
-    piwikSiteId = properties.piwikSiteId;
-
-
 }

src/app/claims/myClaims/myClaims.component.ts

@@ -9,7 +9,7 @@ import {properties} from "../../../environments/environment";
 @Component({
     selector: 'openaire-my-claims',
     template: `
-    <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL" [piwikSiteId]="piwikSiteId">
+    <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
 </my-claims>
 `
 
@@ -18,7 +18,6 @@ import {properties} from "../../../environments/environment";
   claimsInfoURL:string;
   userInfoURL: string;
   sub;
-  piwikSiteId = properties.piwikSiteId;
 
   constructor (private route: ActivatedRoute) {
   }

src/app/deposit/deposit.component.ts

@@ -1,18 +1,12 @@
 import {Component} from '@angular/core';
-import {properties} from "../../environments/environment";
 
 @Component({
   selector: 'openaire-deposit',
   template: `    
-    <deposit-first-page [piwikSiteId]="piwikSiteId"></deposit-first-page>
+    <deposit-first-page></deposit-first-page>
     `
 })
 
 export class OpenaireDepositComponent {
-  piwikSiteId = properties.piwikSiteId;
-    constructor() {
-  }
-
-  public ngOnInit() {}
 }
 

src/app/deposit/searchDataprovidersToDeposit.component.ts

@@ -1,18 +1,12 @@
 import {Component} from '@angular/core';
-import {properties} from "../../environments/environment";
 
 @Component({
   selector: 'openaire-search-deposit',
   template: `
-    <deposit-search-dataproviders [piwikSiteId]="piwikSiteId"></deposit-search-dataproviders>
+    <deposit-search-dataproviders></deposit-search-dataproviders>
     `
 })
 
 export class OpenaireSearchDataprovidersToDepositComponent {
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor() {}
-
-  public ngOnInit() {}
 }
 

src/app/develop/develop.component.ts

@@ -119,10 +119,7 @@ export class DevelopComponent implements OnInit {
         this._meta.updateTag({content: description}, "property='og:description'");
         this._meta.updateTag({content: title}, "property='og:title'");
         this._title.setTitle(title);
-        if(properties.enablePiwikTrack && (typeof document !== 'undefined')){
+        this.subs.push(this._piwikService.trackView(properties, "OpenAIRE").subscribe());
-          this.subs.push(this._piwikService.trackView(properties, "OpenAIRE").subscribe());
-        }
-
       }else {
         this.navigateToError();
       }

src/app/landingPages/dataProvider/dataProvider.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-dataprovider',
-    template: `<dataprovider [piwikSiteId]="piwikSiteId"></dataprovider>`,
+    template: `<dataprovider></dataprovider>`,
  })
 export class OpenaireDataProviderComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/dataset/dataset.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-dataset',
-    template: `<result-landing type="dataset" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="dataset"></result-landing>`,
  })
 export class OpenaireDatasetComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-htmlProjectReport',
-    template: `<htmlProjectReport [piwikSiteId]=""></htmlProjectReport>`,
+    template: `<htmlProjectReport></htmlProjectReport>`,
  })
 export class OpenaireHtmlProjectReportComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/organization/organization.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-organization',
-    template: `<organization [piwikSiteId]="piwikSiteId"></organization>`,
+    template: `<organization ></organization>`,
  })
 export class OpenaireOrganizationComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/orp/orp.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-orp',
-    template: `<result-landing type="orp" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="orp"></result-landing>`,
  })
 export class OpenaireOrpComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/project/project.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-project',
-    template: `<project [piwikSiteId]="piwikSiteId"></project>`,
+    template: `<project></project>`,
  })
 export class OpenaireProjectComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/publication/publication.component.ts

@@ -1,19 +1,9 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
   selector: 'openaire-publication',
   template: `
-    <result-landing type="publication" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    <result-landing type="publication"></result-landing>`,
 })
 export class OpenairePublicationComponent {
-  piwikSiteId = properties.piwikSiteId;
-
-
-  constructor() {}
-
-  ngOnInit() {
-  }
-
-
 }

src/app/landingPages/result/result.component.ts

@@ -1,11 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-publication',
-    template: `<result-landing type="result" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="result"></result-landing>`,
  })
 export class OpenaireResultComponent{
-  piwikSiteId = properties.piwikSiteId;
-
 }

src/app/landingPages/service/service.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-dataprovider',
-    template: `<dataprovider type="service" [piwikSiteId]="piwikSiteId"></dataprovider>`,
+    template: `<dataprovider type="service"></dataprovider>`,
  })
 export class OpenaireServiceComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/software/software.component.ts

@@ -1,19 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-software',
-    template: `<result-landing type="software" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="software"></result-landing>`,
  })
 export class OpenaireSoftwareComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 870ce718972596f5c36ae79271927c7f4279ff58
+Subproject commit 2f989107123ae674aba4907b113e4498a8f87786

src/app/searchPages/advanced/advancedSearchDataProviders.component.ts

@@ -8,7 +8,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   selector: 'openaire-advanced-search-dataprovider',
   template: `
     <search-dataproviders [simpleView]="false" 
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                          [hasPrefix]="false" [searchForm]="searchForm">
     </search-dataproviders>
 
   `

src/app/searchPages/advanced/advancedSearchOrganizations.component.ts

@@ -7,8 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-advanced-search-organizations',
   template: `
-    <search-organizations  [simpleView]="false" 
+    <search-organizations  [simpleView]="false" [hasPrefix]="false" [searchForm]="searchForm">
-                           [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-organizations>
 
   `

src/app/searchPages/advanced/advancedSearchProjects.component.ts

@@ -6,8 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
     selector: 'openaire-advanced-search-projects',
     template: `
-    <search-projects [simpleView]="false"
+    <search-projects [simpleView]="false" [hasPrefix]="false" [searchForm]="searchForm">
-                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-projects>
 
     `

src/app/searchPages/advanced/advancedSearchServices.component.ts

@@ -8,8 +8,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-advanced-search-service',
   template: `
-    <search-dataproviders [simpleView]="false" 
+    <search-dataproviders [simpleView]="false" [hasPrefix]="false"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
                           type="services" entityType="service" [typeName]="openaireEntities.SERVICES" 
                           [searchForm]="searchForm">
     </search-dataproviders>

src/app/searchPages/advanced/searchResearchResults.component.ts

@@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   selector: 'openaire-search-results',
   template: `
     <search-research-results resultType="result" [simpleView]="false"
-                             [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
+                             [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
   `
 
 })

src/app/searchPages/find/search.component.ts

@@ -1,17 +1,13 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 @Component({
   selector: 'openaire-search-find',
   template: `
-    <search-all logoURL="/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [piwikSiteId]="piwikSiteId" 
+    <search-all logoURL="/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE"
                 [searchForm]="searchForm"></search-all>
   `,
  })
 export class OpenaireSearchComponent{
-  piwikSiteId = properties.piwikSiteId;
   public searchForm: SearchForm = {class: 'search-form', dark: true};
-  constructor ( ) {}
-  ngOnInit() {}
 }

src/app/searchPages/simple/searchDataproviders.component.ts

@@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-search-dataproviders',
   template: `
-    <search-dataproviders [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-dataproviders>
+    <search-dataproviders [hasPrefix]="false" [searchForm]="searchForm"></search-dataproviders>
   `
 })
 export class OpenaireSearchDataprovidersComponent {

src/app/searchPages/simple/searchOrganizations.component.ts

@@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-search-organizations',
   template: `
-    <search-organizations [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-organizations>
+    <search-organizations [hasPrefix]="false" [searchForm]="searchForm"></search-organizations>
   `
 })
 export class OpenaireSearchOrganizationsComponent {

src/app/searchPages/simple/searchProjects.component.ts

@@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-search-projects',
   template: `
-    <search-projects [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-projects>
+    <search-projects [hasPrefix]="false" [searchForm]="searchForm"></search-projects>
   `
 })
 export class OpenaireSearchProjectsComponent {

src/app/searchPages/simple/searchResearchResults.component.ts

@@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   selector: 'openaire-search-results',
   template: `
     <search-research-results resultType="result" [stickyForm]="false"
-                             [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
+                             [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
   `
 })
 export class OpenaireSearchResearchResultsComponent {

src/app/searchPages/simple/searchServices.component.ts

@@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-search-services',
   template: `
-    <search-dataproviders [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
+    <search-dataproviders [hasPrefix]="false"
                           type="services" entityType="service" [typeName]="openaireEntities.SERVICES" 
                           [searchForm]="searchForm">
     </search-dataproviders>