pass piwikSiteId in landing, search & deposit pages as Input | add siteId parameter in community & communities components

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@51749 d315682c-612b-4755-9ff5-7f18f6832af3

connect-production-properties.json

@@ -1,5 +1,5 @@
 {
-  "enablePiwikTrack" : false,
+  "enablePiwikTrack" : true,
   "enableHelper" : true,
   "useCache" : true,
   "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
@@ -29,7 +29,8 @@
 
   "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
 
-  "piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6",
+  "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
+  "piwikSiteId" : "80",
   "loginUrl" :"https://beta.services.openaire.eu/connect-user-management/openid_connect_login",
 
   "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",

src/app/communities/communities.component.ts

@@ -54,7 +54,7 @@ export class CommunitiesComponent {
                  var url = data.envSpecific.baseLink+this._router.url
                  this._meta.updateProperty("og:url", url);
                  if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
-                   this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
+                   this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE Connect", this.properties.piwikSiteId).subscribe();
                  }
 
                  this._communitiesService.getCommunities(this.properties, this.properties.communitiesAPI).subscribe(

src/app/community/community.component.ts

@@ -11,6 +11,7 @@ import {ConfigurationService}         from '../openaireLibrary/utils/configurati
 import {PiwikService}                 from '../openaireLibrary/utils/piwik/piwik.service';
 import {SearchEntriesService}         from '../searchEntries/searchEntries.service';
 import {Title, Meta} from '@angular/platform-browser';
+import {PiwikHelper} from '../utils/piwikHelper';
 @Component({
     selector: 'community',
     templateUrl: 'community.component.html',
@@ -63,9 +64,7 @@ export class CommunityComponent {
            this.properties = data.envSpecific;
            var url = data.envSpecific.baseLink+this._router.url
           this._meta.updateTag({content:url},"property='og:url'");
-           if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
-             this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
-           }
+
 
           //  this.route.queryParams.subscribe(
           //    communityId => {
@@ -84,6 +83,9 @@ export class CommunityComponent {
                       this._meta.updateTag({content:community.description},"property='og:description'");
                       this._meta.updateTag({content:community.title},"property='og:title'");
                       this._title.setTitle(community.title);
+                      if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
+                        this.piwiksub = this._piwikService.trackView(this.properties, community.title,PiwikHelper.siteIDs[this.communityId]).subscribe();
+                      }
 
                        //console.log(community);
                  });

src/app/deposit/datasets/depositBySubjectResult.component.ts

@@ -1,12 +1,19 @@
 import {Component, Input} from '@angular/core';
 import {Observable}       from 'rxjs/Observable';
- 
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+
 
 @Component({
     selector: 'openaire-deposit-by-subject-result',
-    template:`<deposit-by-subject-result></deposit-by-subject-result>`
+    template:`<deposit-by-subject-result [piwikSiteId]=piwikSiteId></deposit-by-subject-result>`
 })
 
 export class OpenaireDepositBySubjectResultComponent {
+  piwikSiteId = null;
+  constructor (  ) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+  }
 
 }

src/app/deposit/datasets/depositDatasets.component.ts

@@ -1,14 +1,21 @@
-import {Component} from '@angular/core';
+import {Component, Input} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-deposit-datasets',
     template: `
-    <deposit-datasets>
+    <deposit-datasets [piwikSiteId]=piwikSiteId>
 
 </deposit-datasets>
     `
 })
 
 export class OpenaireDepositDatasetsComponent {
+  piwikSiteId = null;
+  constructor (  ) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+  }
 
 }

src/app/deposit/datasets/depositDatasetsResult.component.ts

@@ -1,14 +1,21 @@
-import {Component} from '@angular/core';
+import {Component, Input} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-deposit-datasets-result',
     template: `
-        <deposit-datasets-result></deposit-datasets-result>
+        <deposit-datasets-result [piwikSiteId]=piwikSiteId></deposit-datasets-result>
 
 
     `
 })
 
 export class OpenaireDepositDatasetsResultComponent {
+  piwikSiteId = null;
+  constructor (  ) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+  }
 
 }

src/app/deposit/publications/depositPublications.component.ts

@@ -1,11 +1,19 @@
-import {Component} from '@angular/core';
+import {Component, Input} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-deposit-publications',
     template: `
-    <deposit-publications></deposit-publications>
+    <deposit-publications [piwikSiteId]=piwikSiteId></deposit-publications>
     `
 })
 
 export class OpenaireDepositPublicationsComponent {
+  piwikSiteId = null;
+  constructor (  ) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+  }
+
  }

src/app/deposit/publications/depositPublicationsResult.component.ts

@@ -1,12 +1,20 @@
-import {Component} from '@angular/core';
+import {Component, Input} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-deposit-publications-result',
     template: `
-        <deposit-publications-result></deposit-publications-result>
+        <deposit-publications-result [piwikSiteId]=piwikSiteId></deposit-publications-result>
     `
 })
 
 export class OpenaireDepositPublicationsResultComponent {
+  piwikSiteId = null;
+  constructor (  ) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+  }
+
 
 }

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

@@ -1,15 +1,20 @@
 import {Component, ViewChild, ElementRef} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-dataprovider',
-    template: `<dataprovider></dataprovider>`,
+    template: `<dataprovider [piwikSiteId]=piwikSiteId></dataprovider>`,
  })
 export class OpenaireDataProviderComponent{
+  piwikSiteId = null;
   constructor (  ) {
-
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
 
-  ngOnInit() {
+ngOnInit() {
+
 }
 
 

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

@@ -1,12 +1,15 @@
 import {Component, ViewChild, ElementRef} from '@angular/core';
-
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 @Component({
     selector: 'openaire-dataset',
-    template: `<dataset></dataset>`,
+    template: `<dataset  [piwikSiteId]=piwikSiteId></dataset>`,
  })
 export class OpenaireDatasetComponent{
+  piwikSiteId = null;
   constructor (  ) {
-
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
 
   ngOnInit() {

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

@@ -1,12 +1,15 @@
 import {Component, ViewChild, ElementRef} from '@angular/core';
-
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 @Component({
     selector: 'openaire-htmlProjectReport',
-    template: `<htmlProjectReport></htmlProjectReport>`,
+    template: `<htmlProjectReport  [piwikSiteId]=piwikSiteId></htmlProjectReport>`,
  })
 export class OpenaireHtmlProjectReportComponent{
+  piwikSiteId = null;
   constructor (  ) {
-
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
 
   ngOnInit() {

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

@@ -1,12 +1,15 @@
 import {Component, ViewChild, ElementRef} from '@angular/core';
-
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 @Component({
     selector: 'openaire-organization',
-    template: `<organization></organization>`,
+    template: `<organization  [piwikSiteId]=piwikSiteId></organization>`,
  })
 export class OpenaireOrganizationComponent{
+  piwikSiteId = null;
   constructor (  ) {
-
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
 
   ngOnInit() {

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

@@ -1,12 +1,15 @@
 import {Component, ViewChild, ElementRef} from '@angular/core';
-
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 @Component({
     selector: 'openaire-project',
-    template: `<project></project>`,
+    template: `<project  [piwikSiteId]=piwikSiteId></project>`,
  })
 export class OpenaireProjectComponent{
+  piwikSiteId = null;
   constructor (  ) {
-
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
 
   ngOnInit() {

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

@@ -1,12 +1,15 @@
 import {Component, ViewChild, ElementRef} from '@angular/core';
-
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 @Component({
     selector: 'openaire-publication',
-    template: `<publication></publication>`,
+    template: `<publication  [piwikSiteId]=piwikSiteId></publication>`,
  })
 export class OpenairePublicationComponent{
+  piwikSiteId = null;
   constructor (  ) {
-
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
 
   ngOnInit() {

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

@@ -1,12 +1,15 @@
 import {Component, ViewChild, ElementRef} from '@angular/core';
-
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 @Component({
     selector: 'openaire-software',
-    template: `<software></software>`,
+    template: `<software  [piwikSiteId]=piwikSiteId></software>`,
  })
 export class OpenaireSoftwareComponent{
+  piwikSiteId = null;
   constructor (  ) {
-
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
 
   ngOnInit() {

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

@@ -1,4 +1,6 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component, Input} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 
 @Component({
@@ -10,7 +12,11 @@ import {Component, Input, ViewChild} from '@angular/core';
     `
  })
 
-export class OpenaireAdvancedSearchDatasetsComponent { 
-
+export class OpenaireAdvancedSearchDatasetsComponent {
 
+  piwikSiteId = null;
+  constructor (  ) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+  }
 }

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

@@ -1,4 +1,6 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component, Input} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 
 @Component({
@@ -9,5 +11,10 @@ import {Component, Input, ViewChild} from '@angular/core';
     `
  })
 
-export class OpenaireAdvancedSearchPublicationsComponent { 
+export class OpenaireAdvancedSearchPublicationsComponent {
+  piwikSiteId = null;
+  constructor (  ) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+  }
 }

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

@@ -1,4 +1,6 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component, Input} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-advanced-search-software',
@@ -10,6 +12,10 @@ import {Component, Input, ViewChild} from '@angular/core';
  })
 
 export class OpenaireAdvancedSearchSoftwareComponent {
-  
+  piwikSiteId = null;
+  constructor (  ) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+  }
 
 }

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

@@ -11,6 +11,7 @@ import {SearchUtilsClass } from '../../openaireLibrary/searchPages/searchUtils/s
 import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
 import {SearchCommunityDataprovidersService} from '../../openaireLibrary/connect/contentProviders/searchDataproviders.service';
 import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+import {PiwikHelper} from '../../utils/piwikHelper';
 
 @Component({
     selector: 'openaire-search-dataproviders',
@@ -46,10 +47,13 @@ export class OpenaireSearchDataprovidersComponent {
   private communityId: string = '';
 
   @ViewChild (SearchPageTableViewComponent) searchPage : SearchPageTableViewComponent ;
-
+  piwikSiteId = null;
+  
   constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchCommunityDataprovidersService) {
     this.errorCodes = new ErrorCodes();
     this.searchUtils.status = this.errorCodes.LOADING;
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
 
   public ngOnInit() {

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

@@ -1,5 +1,7 @@
 import {Component, Input, ViewChild} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-search-datasets',
@@ -16,8 +18,12 @@ import {ActivatedRoute} from '@angular/router';
 export class OpenaireSearchDatasetsComponent {
   advancedSearchParameters:any;
   connectCommunityId:string;
-  constructor(  private  route: ActivatedRoute) {
+  piwikSiteId = null;
+  constructor ( private  route: ActivatedRoute) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
+ 
   ngOnInit() {
     this.route.queryParams.subscribe(data => {
 

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

@@ -1,4 +1,6 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component, Input} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-search-organizations',
@@ -11,5 +13,10 @@ import {Component, Input, ViewChild} from '@angular/core';
 
 })
 export class OpenaireSearchOrganizationsComponent {
+  piwikSiteId = null;
+  constructor (  ) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+  }
 
 }

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

@@ -10,6 +10,7 @@ import {SearchPageTableViewComponent } from '../../openaireLibrary/searchPages/s
 import {SearchUtilsClass } from '../../openaireLibrary/searchPages/searchUtils/searchUtils.class';
 import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
 import {SearchCommunityProjectsService} from '../../openaireLibrary/connect/projects/searchProjects.service';
+import {PiwikHelper} from '../../utils/piwikHelper';
 import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
@@ -46,10 +47,13 @@ export class OpenaireSearchProjectsComponent {
   private communityId: string = '';
 
   @ViewChild (SearchPageTableViewComponent) searchPage : SearchPageTableViewComponent ;
+  piwikSiteId = null;
 
   constructor (private route: ActivatedRoute, private _searchProjectsService: SearchCommunityProjectsService) {
     this.errorCodes = new ErrorCodes();
     this.searchUtils.status = this.errorCodes.LOADING;
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
 
   public ngOnInit() {

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

@@ -1,5 +1,7 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component, Input} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-search-publications',
@@ -17,7 +19,10 @@ export class OpenaireSearchPublicationsComponent {
 
   advancedSearchParameters:any;
   connectCommunityId:string;
-  constructor(  private  route: ActivatedRoute) {
+  piwikSiteId = null;
+  constructor ( private  route: ActivatedRoute) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
   ngOnInit() {
     this.route.queryParams.subscribe(data => {

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

@@ -1,5 +1,7 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component, Input} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
 
 @Component({
     selector: 'openaire-search-software',
@@ -16,7 +18,10 @@ import {ActivatedRoute} from '@angular/router';
 export class OpenaireSearchSoftwareComponent {
   advancedSearchParameters:any;
   connectCommunityId:string;
-  constructor(  private  route: ActivatedRoute) {
+  piwikSiteId = null;
+  constructor ( private  route: ActivatedRoute) {
+    var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+    this.piwikSiteId = PiwikHelper.siteIDs[communityId];
   }
   ngOnInit() {
     this.route.queryParams.subscribe(data => {

src/app/utils/manage/manage.component.ts

@@ -9,7 +9,7 @@ import {Session} from '../../openaireLibrary/login/utils/helper.class';
     template: `
 
 
-      <a *ngIf="isManager" [href]="'https://admin.demo.openaire.eu/dashboard?communityId='+communityId"  class="uk-button uk-button-default uk-margin-left" target="_blank"  >
+      <a *ngIf="isManager" [href]="'https://beta.admin.connect.openaire.eu/dashboard?communityId='+communityId"  class="uk-button uk-button-default uk-margin-left" target="_blank"  >
         <span class="uk-margin-small-right uk-icon" uk-icon="cog"> </span>Manage</a>
 
 

src/app/utils/piwikHelper.ts

@@ -0,0 +1,52 @@
+export class PiwikHelper{
+  public static siteIDs={
+    "connect": 80,
+    "dh-ch":81,
+    "ee":82,
+    "egi":83,
+    "elixir-gr":84,
+    "fam":85,
+    "instruct":86,
+    "mes":87,
+    "ni":88,
+    "oa-pg":89,
+    "rda":90
+
+  }
+
+  /*
+
+beta.connect.openaire.eu
+
+80
+
+beta.dh-ch.openaire.eu
+
+81
+
+beta.ee.openaire.eu
+
+82
+
+beta.egi.openaire.eu
+83
+beta.elixir-gr.openaire.eu
+84
+beta.fam.openaire.eu
+85
+beta.instruct.openaire.eu
+86
+beta.mes.openaire.eu
+87
+beta.ni.openaire.eu
+88
+beta.oa-pg.openaire.eu
+89
+beta.rda.openaire.eu
+90
+
+
+
+
+  */
+}

src/assets/env-properties.json

@@ -39,8 +39,8 @@
 
   "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
 
-  "piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6",
-
+  "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
+  "piwikSiteId" : "80",
 
   "loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",