Change piwik base on the new dynamic piwik.

This commit is contained in:
Konstantinos Triantafyllou 2023-07-13 14:21:15 +03:00
parent 6cd4dbb4e9
commit 6ab34a0484
30 changed files with 30 additions and 166 deletions

View File

@ -120,7 +120,7 @@ export class AppRoutingModule {
} }
} }
constructor( private config: ConfigurationService, private router: Router){ 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) {
if (data['pages']) { if (data['pages']) {
for (var i = 0; i < data['pages'].length; i++) { for (var i = 0; i < data['pages'].length; i++) {

View File

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

View File

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

View File

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

View File

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

View File

@ -1,18 +1,12 @@
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 [piwikSiteId]="piwikSiteId"></deposit-first-page> <deposit-first-page></deposit-first-page>
` `
}) })
export class OpenaireDepositComponent { export class OpenaireDepositComponent {
piwikSiteId = properties.piwikSiteId;
constructor() {
}
public ngOnInit() {}
} }

View File

@ -1,18 +1,12 @@
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 [piwikSiteId]="piwikSiteId"></deposit-search-dataproviders> <deposit-search-dataproviders></deposit-search-dataproviders>
` `
}) })
export class OpenaireSearchDataprovidersToDepositComponent { export class OpenaireSearchDataprovidersToDepositComponent {
piwikSiteId = properties.piwikSiteId;
constructor() {}
public ngOnInit() {}
} }

View File

@ -119,10 +119,7 @@ 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());
this.subs.push(this._piwikService.trackView(properties, "OpenAIRE").subscribe());
}
}else { }else {
this.navigateToError(); this.navigateToError();
} }

View File

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

View File

@ -1,20 +1,8 @@
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" [piwikSiteId]="piwikSiteId"></result-landing>`, template: `<result-landing type="dataset"></result-landing>`,
}) })
export class OpenaireDatasetComponent{ export class OpenaireDatasetComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
} }

View File

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

View File

@ -1,20 +1,8 @@
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 [piwikSiteId]="piwikSiteId"></organization>`, template: `<organization ></organization>`,
}) })
export class OpenaireOrganizationComponent{ export class OpenaireOrganizationComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
} }

View File

@ -1,20 +1,8 @@
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" [piwikSiteId]="piwikSiteId"></result-landing>`, template: `<result-landing type="orp"></result-landing>`,
}) })
export class OpenaireOrpComponent{ export class OpenaireOrpComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
} }

View File

@ -1,20 +1,8 @@
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 [piwikSiteId]="piwikSiteId"></project>`, template: `<project></project>`,
}) })
export class OpenaireProjectComponent{ export class OpenaireProjectComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
} }

View File

@ -1,19 +1,9 @@
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" [piwikSiteId]="piwikSiteId"></result-landing>`, <result-landing type="publication"></result-landing>`,
}) })
export class OpenairePublicationComponent { export class OpenairePublicationComponent {
piwikSiteId = properties.piwikSiteId;
constructor() {}
ngOnInit() {
}
} }

View File

@ -1,11 +1,8 @@
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" [piwikSiteId]="piwikSiteId"></result-landing>`, template: `<result-landing type="result"></result-landing>`,
}) })
export class OpenaireResultComponent{ export class OpenaireResultComponent{
piwikSiteId = properties.piwikSiteId;
} }

View File

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

View File

@ -1,19 +1,8 @@
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" [piwikSiteId]="piwikSiteId"></result-landing>`, template: `<result-landing type="software"></result-landing>`,
}) })
export class OpenaireSoftwareComponent{ export class OpenaireSoftwareComponent{
piwikSiteId = properties.piwikSiteId;
constructor ( ) {
}
ngOnInit() {
}
} }

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,17 +1,13 @@
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {properties} from "../../../environments/environment";
import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
@Component({ @Component({
selector: 'openaire-search-find', selector: 'openaire-search-find',
template: ` 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> [searchForm]="searchForm"></search-all>
`, `,
}) })
export class OpenaireSearchComponent{ export class OpenaireSearchComponent{
piwikSiteId = properties.piwikSiteId;
public searchForm: SearchForm = {class: 'search-form', dark: true}; public searchForm: SearchForm = {class: 'search-form', dark: true};
constructor ( ) {}
ngOnInit() {}
} }

View File

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

View File

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

View File

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

View File

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

View File

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