Change piwik base on the new dynamic piwik.

src/app/app-routing.module.ts

@@ -112,7 +112,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

@@ -39,7 +39,7 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields"
                    ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
               </span></a>
       </cookie-law>
-      <bottom *ngIf="isClient && properties" [properties]=properties [centered]="true" [showMenuItems]="true" [menuItems]="[]" [darkBackground]="false" ></bottom>
+      <bottom *ngIf="isClient && properties" [properties]=properties [centered]="true" [showMenuItems]="true" [menuItems]="[]"></bottom>
     </div>
   `
 })
@@ -64,7 +64,7 @@ export class AppComponent {
     this.id = ConnectHelper.getCommunityFromDomain(this.properties.domain);
     this.agg = PortalAggregators.getFilterInfoByMenuId(this.id);
     this.setStyles();
-    this.configurationService.initStaticCommunityInformation(PortalAggregators.getCommunityInfoByMenuId(this.id));
+    this.configurationService.initStaticPortal(PortalAggregators.getCommunityInfoByMenuId(this.id));
     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

@@ -1,24 +1,17 @@
 import {Component} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
-import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
 import {Subscriber} from "rxjs";
 import {properties} from "../../../environments/environment";
 
 
-
 @Component({
     selector: 'openaire-my-claims',
-    template: `
+    template: `<my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL"></my-claims>`
-    <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL" [piwikSiteId]="piwikSiteId">
-</my-claims>
-`
-
 })
  export class OpenaireMyClaimsComponent {
   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/fos/fos.component.ts

@@ -1,16 +1,10 @@
 import {Component} from "@angular/core";
-import {properties} from "../../environments/environment";
 
 @Component({
 	selector: 'aggregator-fos',
 	template: `
-		<fos [piwikSiteId]="piwikSiteId"></fos>
+		<fos></fos>
 	`
 })
 export class AggregatorFosComponent {
-	piwikSiteId = properties.piwikSiteId;
-
-	constructor() {
-
-	}
 }

src/app/home/home.component.ts

@@ -110,7 +110,7 @@ export class HomeComponent {
         this.numbersComponent.showProjects = portalProperties.entities.project.isEnabled;
         this.numbersComponent.showDataProviders = portalProperties.entities.datasource.isEnabled;
       }
-      this.subs.push(this.config.communityInformationState.subscribe(data => {
+      this.subs.push(this.config.portalAsObservable.subscribe(data => {
             if (data) {
               var showEntity = {};
               for (var i = 0; i < data['entities'].length; i++) {

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

@@ -3,18 +3,7 @@ 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

@@ -3,18 +3,7 @@ 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,8 @@
 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 {
+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 8b57fae58515adae81210f99fdef27905b9f4e8a

src/app/sdg/sdg.component.ts

@@ -7,11 +7,10 @@ import {AggregatorInfo, PortalAggregators} from "../utils/aggregators";
 @Component({
 	selector: 'aggregator-sdg',
 	template: `
-		<sdg [piwikSiteId]="piwikSiteId" [customFilter]="customFilter"></sdg>
+		<sdg [customFilter]="customFilter"></sdg>
 	`
 })
 export class AggregatorSdgComponent {
-	piwikSiteId = properties.piwikSiteId;
 	aggregatorId;
 	aggregator: AggregatorInfo;
 	customFilter: SearchCustomFilter = null;

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

@@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   selector: 'openaire-advanced-search-dataprovider',
   template: `
     <search-dataproviders [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/dataproviders':null"
-    [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+    [hasPrefix]="false" [searchForm]="searchForm">
     </search-dataproviders>
 
   `

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

@@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   selector: 'openaire-advanced-search-organizations',
   template: `
     <search-organizations  [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/organizations':null"
-                           [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                           [hasPrefix]="false" [searchForm]="searchForm">
     </search-organizations>
 
   `

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

@@ -10,7 +10,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
     selector: 'openaire-advanced-search-projects',
     template: `
     <search-projects [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/projects':null"
-                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                     [hasPrefix]="false" [searchForm]="searchForm">
     </search-projects>
 
     `

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

@@ -12,7 +12,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   selector: 'openaire-advanced-search-service',
   template: `
     <search-dataproviders [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/services':null" 
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
+                          [hasPrefix]="false"
                           type="services" entityType="service" [typeName]="openaireEntities.SERVICES" 
                           [searchForm]="searchForm">
     </search-dataproviders>

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

@@ -10,7 +10,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
     selector: 'openaire-search-results',
     template: `
       <search-research-results resultType="result" [simpleView]="false" [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes':null"
-                               [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
+                               [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
     `
 
 })

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

@@ -8,22 +8,19 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
     selector: 'openaire-search-find',
     template: `
-    <search-all logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter" [piwikSiteId]="piwikSiteId" 
+    <search-all logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter"
                 [searchForm]="searchForm" [openAccess]="false"></search-all>
     `,
  })
 export class OpenaireSearchComponent{
   customFilter:SearchCustomFilter= null;
-  piwikSiteId = properties.piwikSiteId;
   public searchForm: SearchForm = {class: 'search-form', dark: true};
-  constructor ( ) {}
+
+
   ngOnInit() {
     let id = ConnectHelper.getCommunityFromDomain(properties.domain);
     let agg:AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id);
     this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
 
 }
-
-
-
 }

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

@@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   template: `
 
     <search-dataproviders [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/dataproviders':null"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                          [hasPrefix]="false" [searchForm]="searchForm">
     </search-dataproviders>
 
   `

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

@@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
     template: `
 
     <search-organizations [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/organizations':null"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                          [hasPrefix]="false" [searchForm]="searchForm">
     </search-organizations>
 
     `

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

@@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
     template: `
 
     <search-projects [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/projects':null"
-                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                     [hasPrefix]="false" [searchForm]="searchForm">
     </search-projects>
      `
 

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

@@ -10,7 +10,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
     selector: 'openaire-search-results',
     template: `
       <search-research-results resultType="result" [stickyForm]="false" [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes':null"
-                               [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
+                               [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
     `
 
 })

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

@@ -12,7 +12,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   template: `
 
     <search-dataproviders [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/services':null"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
+                          [hasPrefix]="false"
                           type="services" entityType="service" [typeName]="openaireEntities.SERVICES" 
                           [searchForm]="searchForm">
     </search-dataproviders>