MaDgIK
/
eosc-explore
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

add piwik id - enable tracking in all components

This commit is contained in:
argirok 2021-11-09 12:31:44 +02:00
parent 81695838f7
commit bf6c1db2cc
26 changed files with 130 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/claims/directLinking/directLinking.component.ts
View File

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

5
src/app/claims/linking/linkingGeneric.component.ts
View File

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

5
src/app/claims/myClaims/myClaims.component.ts
View File

@ -2,13 +2,14 @@ import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
import {Subscriber} from "rxjs"; import {Subscriber} from "rxjs";
import {properties} from "../../../environments/environment";
@Component({ @Component({
selector: 'openaire-my-claims', selector: 'openaire-my-claims',
template: ` template: `
<my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL"> <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL" [piwikSiteId]="piwikSiteId">
</my-claims> </my-claims>
` `
@ -17,6 +18,8 @@ import {Subscriber} from "rxjs";
claimsInfoURL:string; claimsInfoURL:string;
userInfoURL: string; userInfoURL: string;
sub; sub;
piwikSiteId = properties.piwikSiteId;
constructor (private route: ActivatedRoute) { constructor (private route: ActivatedRoute) {
} }
ngOnDestroy() { ngOnDestroy() {

7
src/app/deposit/deposit.component.ts
View File

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

4
src/app/deposit/searchDataprovidersToDeposit.component.ts
View File

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

14
src/app/develop/develop.component.ts
View File

@ -5,6 +5,8 @@ import {properties} from "../../environments/environment";
import {Router} from "@angular/router"; import {Router} from "@angular/router";
import {AggregatorInfo, PortalAggregators} from "../utils/aggregators"; import {AggregatorInfo, PortalAggregators} from "../utils/aggregators";
import {ConnectHelper} from "../openaireLibrary/connect/connectHelper"; import {ConnectHelper} from "../openaireLibrary/connect/connectHelper";
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
import {Subscription} from "rxjs";
@Component({ @Component({
selector: 'develop', selector: 'develop',
@ -90,13 +92,18 @@ import {ConnectHelper} from "../openaireLibrary/connect/connectHelper";
export class DevelopComponent implements OnInit { export class DevelopComponent implements OnInit {
public aggregator: AggregatorInfo = null; public aggregator: AggregatorInfo = null;
subs: Subscription[] = [];
constructor(private seoService: SEOService, constructor(private seoService: SEOService,
private _meta: Meta, private _meta: Meta,
private _router: Router, private _router: Router,
private _title: Title) { private _title: Title, private _piwikService:PiwikService,) {
}
public ngOnDestroy() {
for (let sub of this.subs) {
sub.unsubscribe();
}
} }
ngOnInit() { ngOnInit() {
let id = ConnectHelper.getCommunityFromDomain(properties.domain); let id = ConnectHelper.getCommunityFromDomain(properties.domain);
@ -113,6 +120,9 @@ export class DevelopComponent implements OnInit {
this._meta.updateTag({content: description}, "property='og:description'"); this._meta.updateTag({content: description}, "property='og:description'");
this._meta.updateTag({content: title}, "property='og:title'"); this._meta.updateTag({content: title}, "property='og:title'");
this._title.setTitle(title); this._title.setTitle(title);
if(properties.enablePiwikTrack && (typeof document !== 'undefined')){
this.subs.push(this._piwikService.trackView(properties, "OpenAIRE").subscribe());
}
}else { }else {
this.navigateToError(); this.navigateToError();

7
src/app/landingPages/dataProvider/dataProvider.component.ts
View File

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

5
src/app/landingPages/dataset/dataset.component.ts
View File

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

7
src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
View File

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

5
src/app/landingPages/organization/organization.component.ts
View File

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

5
src/app/landingPages/orp/orp.component.ts
View File

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

5
src/app/landingPages/project/project.component.ts
View File

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

5
src/app/landingPages/publication/publication.component.ts
View File

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

8
src/app/landingPages/result/result.component.ts
View File

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

6
src/app/landingPages/software/software.component.ts
View File

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

4
src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
View File

@ -9,14 +9,14 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
@Component({ @Component({
selector: 'openaire-advanced-search-dataprovider', selector: 'openaire-advanced-search-dataprovider',
template: ` template: `
<search-dataproviders [customFilter]="customFilter" [simpleView]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/dataproviders'"> <search-dataproviders [customFilter]="customFilter" [simpleView]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/dataproviders'"
[piwikSiteId]="properties.piwikSiteId">
</search-dataproviders> </search-dataproviders>
` `
}) })
export class OpenaireAdvancedSearchDataProvidersComponent { export class OpenaireAdvancedSearchDataProvidersComponent {
customFilter: SearchCustomFilter = null; customFilter: SearchCustomFilter = null;
properties: EnvProperties; properties: EnvProperties;
constructor ( ) {} constructor ( ) {}

3
src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
View File

@ -9,7 +9,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
@Component({ @Component({
selector: 'openaire-advanced-search-organizations', selector: 'openaire-advanced-search-organizations',
template: ` template: `
<search-organizations [customFilter]="customFilter" [simpleView]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/organizations'"> <search-organizations [customFilter]="customFilter" [simpleView]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/organizations'"
[piwikSiteId]="properties.piwikSiteId">
</search-organizations> </search-organizations>
` `

3
src/app/searchPages/advanced/advancedSearchProjects.component.ts
View File

@ -8,7 +8,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
@Component({ @Component({
selector: 'openaire-advanced-search-projects', selector: 'openaire-advanced-search-projects',
template: ` template: `
<search-projects [customFilter]="customFilter" [simpleView]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/projects'"> <search-projects [customFilter]="customFilter" [simpleView]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/projects'"
[piwikSiteId]="properties.piwikSiteId">
</search-projects> </search-projects>
` `

3
src/app/searchPages/advanced/searchResearchResults.component.ts
View File

@ -8,7 +8,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
@Component({ @Component({
selector: 'openaire-search-results', selector: 'openaire-search-results',
template: ` template: `
<search-research-results resultType="result" [simpleView]="false" [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes'"></search-research-results> <search-research-results resultType="result" [simpleView]="false" [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes'"
[piwikSiteId]="properties.piwikSiteId"></search-research-results>
` `
}) })

3
src/app/searchPages/find/search.component.ts
View File

@ -7,11 +7,12 @@ import {properties} from "../../../environments/environment";
@Component({ @Component({
selector: 'openaire-search-find', selector: 'openaire-search-find',
template: ` template: `
<search-all logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter"></search-all> <search-all logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter" [piwikSiteId]="piwikSiteId"></search-all>
`, `,
}) })
export class OpenaireSearchComponent{ export class OpenaireSearchComponent{
customFilter:SearchCustomFilter= null; customFilter:SearchCustomFilter= null;
piwikSiteId = properties.piwikSiteId;
constructor ( ) {} constructor ( ) {}
ngOnInit() { ngOnInit() {
let id = ConnectHelper.getCommunityFromDomain(properties.domain); let id = ConnectHelper.getCommunityFromDomain(properties.domain);

3
src/app/searchPages/simple/searchDataproviders.component.ts
View File

@ -9,7 +9,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
selector: 'openaire-search-dataproviders', selector: 'openaire-search-dataproviders',
template: ` template: `
<search-dataproviders [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/dataproviders'"> <search-dataproviders [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/dataproviders'"
[piwikSiteId]="properties.piwikSiteId">
</search-dataproviders> </search-dataproviders>
` `

3
src/app/searchPages/simple/searchOrganizations.component.ts
View File

@ -9,7 +9,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
selector: 'openaire-search-organizations', selector: 'openaire-search-organizations',
template: ` template: `
<search-organizations [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/organizations'"> <search-organizations [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/organizations'"
[piwikSiteId]="properties.piwikSiteId">
</search-organizations> </search-organizations>
` `

3
src/app/searchPages/simple/searchProjects.component.ts
View File

@ -9,7 +9,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
selector: 'openaire-search-projects', selector: 'openaire-search-projects',
template: ` template: `
<search-projects [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/projects'"> <search-projects [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/projects'"
[piwikSiteId]="properties.piwikSiteId">
</search-projects> </search-projects>
` `

3
src/app/searchPages/simple/searchResearchResults.component.ts
View File

@ -8,7 +8,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
@Component({ @Component({
selector: 'openaire-search-results', selector: 'openaire-search-results',
template: ` template: `
<search-research-results resultType="result" [stickyForm]="false" [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes'" ></search-research-results> <search-research-results resultType="result" [stickyForm]="false" [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes'"
[piwikSiteId]="properties.piwikSiteId"></search-research-results>
` `
}) })

6
src/environments/environment.beta.ts
View File

@ -4,7 +4,7 @@ export let properties: EnvProperties = {
environment: "beta", environment: "beta",
adminToolsPortalType: "aggregator", adminToolsPortalType: "aggregator",
dashboard: "explore", dashboard: "explore",
enablePiwikTrack: false, enablePiwikTrack: true,
useCache: false, useCache: false,
useLongCache: true, useLongCache: true,
showAddThis: true, showAddThis: true,
@ -45,7 +45,7 @@ export let properties: EnvProperties = {
vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
piwikSiteId: null, piwikSiteId: "553",
loginUrl: "https://beta.services.openaire.eu/explore-login/openid_connect_login", loginUrl: "https://beta.services.openaire.eu/explore-login/openid_connect_login",
userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
@ -71,7 +71,7 @@ export let properties: EnvProperties = {
resultsPerPage: 10, resultsPerPage: 10,
"baseLink" : "", "baseLink" : "",
"domain":"https://beta.explore.openaire.eu", "domain":"https://beta.canada.explore.openaire.eu",
searchLinkToResult: "/search/result?id=", searchLinkToResult: "/search/result?id=",
searchLinkToPublication: "/search/publication?articleId=", searchLinkToPublication: "/search/publication?articleId=",

4
src/environments/environment.prod.ts
View File

@ -45,7 +45,7 @@ export let properties: EnvProperties = {
vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/", vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
piwikSiteId: "109", piwikSiteId: "553",
loginUrl: "https://services.openaire.eu/uoa-user-management/openid_connect_login", loginUrl: "https://services.openaire.eu/uoa-user-management/openid_connect_login",
userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
@ -73,7 +73,7 @@ export let properties: EnvProperties = {
resultsPerPage: 10, resultsPerPage: 10,
"baseLink" : "/", "baseLink" : "/",
"domain": "https://explore.openaire.eu", "domain": "https://canada.explore.openaire.eu",
searchLinkToResult: "/search/result?id=", searchLinkToResult: "/search/result?id=",
searchLinkToPublication: "/search/publication?articleId=", searchLinkToPublication: "/search/publication?articleId=",