From 6ab34a0484c4ffde7e00499d2c138454899e6512 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 13 Jul 2023 14:21:15 +0300 Subject: [PATCH] Change piwik base on the new dynamic piwik. --- src/app/app-routing.module.ts | 2 +- src/app/app.component.ts | 2 +- .../directLinking/directLinking.component.ts | 4 +--- src/app/claims/linking/linkingGeneric.component.ts | 5 +---- src/app/claims/myClaims/myClaims.component.ts | 3 +-- src/app/deposit/deposit.component.ts | 8 +------- .../searchDataprovidersToDeposit.component.ts | 8 +------- src/app/develop/develop.component.ts | 5 +---- .../dataProvider/dataProvider.component.ts | 14 +------------- src/app/landingPages/dataset/dataset.component.ts | 14 +------------- .../htmlProjectReport.component.ts | 14 +------------- .../organization/organization.component.ts | 14 +------------- src/app/landingPages/orp/orp.component.ts | 14 +------------- src/app/landingPages/project/project.component.ts | 14 +------------- .../publication/publication.component.ts | 12 +----------- src/app/landingPages/result/result.component.ts | 5 +---- src/app/landingPages/service/service.component.ts | 14 +------------- .../landingPages/software/software.component.ts | 13 +------------ src/app/openaireLibrary | 2 +- .../advancedSearchDataProviders.component.ts | 2 +- .../advancedSearchOrganizations.component.ts | 3 +-- .../advanced/advancedSearchProjects.component.ts | 3 +-- .../advanced/advancedSearchServices.component.ts | 3 +-- .../advanced/searchResearchResults.component.ts | 2 +- src/app/searchPages/find/search.component.ts | 6 +----- .../simple/searchDataproviders.component.ts | 2 +- .../simple/searchOrganizations.component.ts | 2 +- .../searchPages/simple/searchProjects.component.ts | 2 +- .../simple/searchResearchResults.component.ts | 2 +- .../searchPages/simple/searchServices.component.ts | 2 +- 30 files changed, 30 insertions(+), 166 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7f707ab..6c12df9 100644 --- a/src/app/app-routing.module.ts +++ b/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++) { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8d6e161..d794d09 100644 --- a/src/app/app.component.ts +++ b/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; } diff --git a/src/app/claims/directLinking/directLinking.component.ts b/src/app/claims/directLinking/directLinking.component.ts index 7f34732..efab6dd 100644 --- a/src/app/claims/directLinking/directLinking.component.ts +++ b/src/app/claims/directLinking/directLinking.component.ts @@ -4,9 +4,7 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-directLinking', template: ` - ` + ` }) export class OpenaireDirectLinkingComponent { - piwikSiteId = properties.piwikSiteId; - } diff --git a/src/app/claims/linking/linkingGeneric.component.ts b/src/app/claims/linking/linkingGeneric.component.ts index b9a335b..d7c5b1b 100644 --- a/src/app/claims/linking/linkingGeneric.component.ts +++ b/src/app/claims/linking/linkingGeneric.component.ts @@ -3,11 +3,8 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-linking-generic', - template: `` + template: `` }) export class OpenaireLinkingComponent { - piwikSiteId = properties.piwikSiteId; - - } diff --git a/src/app/claims/myClaims/myClaims.component.ts b/src/app/claims/myClaims/myClaims.component.ts index 36117d5..c60df6e 100644 --- a/src/app/claims/myClaims/myClaims.component.ts +++ b/src/app/claims/myClaims/myClaims.component.ts @@ -9,7 +9,7 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-my-claims', template: ` - + ` @@ -18,7 +18,6 @@ import {properties} from "../../../environments/environment"; claimsInfoURL:string; userInfoURL: string; sub; - piwikSiteId = properties.piwikSiteId; constructor (private route: ActivatedRoute) { } diff --git a/src/app/deposit/deposit.component.ts b/src/app/deposit/deposit.component.ts index 094a3b3..e305fd2 100644 --- a/src/app/deposit/deposit.component.ts +++ b/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: ` - + ` }) export class OpenaireDepositComponent { - piwikSiteId = properties.piwikSiteId; - constructor() { - } - - public ngOnInit() {} } diff --git a/src/app/deposit/searchDataprovidersToDeposit.component.ts b/src/app/deposit/searchDataprovidersToDeposit.component.ts index 69b6e5a..f4cffa0 100644 --- a/src/app/deposit/searchDataprovidersToDeposit.component.ts +++ b/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: ` - + ` }) export class OpenaireSearchDataprovidersToDepositComponent { - piwikSiteId = properties.piwikSiteId; - - constructor() {} - - public ngOnInit() {} } diff --git a/src/app/develop/develop.component.ts b/src/app/develop/develop.component.ts index 181d591..e3a892d 100644 --- a/src/app/develop/develop.component.ts +++ b/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(); } diff --git a/src/app/landingPages/dataProvider/dataProvider.component.ts b/src/app/landingPages/dataProvider/dataProvider.component.ts index 938df97..361d3e5 100644 --- a/src/app/landingPages/dataProvider/dataProvider.component.ts +++ b/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: ``, + template: ``, }) export class OpenaireDataProviderComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/dataset/dataset.component.ts b/src/app/landingPages/dataset/dataset.component.ts index 9887dc8..6b7f525 100644 --- a/src/app/landingPages/dataset/dataset.component.ts +++ b/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: ``, + template: ``, }) export class OpenaireDatasetComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts index 0d1c94b..5236c9f 100644 --- a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts +++ b/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: ``, + template: ``, }) export class OpenaireHtmlProjectReportComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/organization/organization.component.ts b/src/app/landingPages/organization/organization.component.ts index 150642b..bae58be 100644 --- a/src/app/landingPages/organization/organization.component.ts +++ b/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: ``, + template: ``, }) export class OpenaireOrganizationComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/orp/orp.component.ts b/src/app/landingPages/orp/orp.component.ts index 14cd92c..a5d348b 100644 --- a/src/app/landingPages/orp/orp.component.ts +++ b/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: ``, + template: ``, }) export class OpenaireOrpComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/project/project.component.ts b/src/app/landingPages/project/project.component.ts index e0ae715..e1c278b 100644 --- a/src/app/landingPages/project/project.component.ts +++ b/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: ``, + template: ``, }) export class OpenaireProjectComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/publication/publication.component.ts b/src/app/landingPages/publication/publication.component.ts index f4a507c..1d6b86d 100644 --- a/src/app/landingPages/publication/publication.component.ts +++ b/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: ` - `, + `, }) export class OpenairePublicationComponent { - piwikSiteId = properties.piwikSiteId; - - - constructor() {} - - ngOnInit() { - } - - } diff --git a/src/app/landingPages/result/result.component.ts b/src/app/landingPages/result/result.component.ts index 7896946..9fa51e2 100644 --- a/src/app/landingPages/result/result.component.ts +++ b/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: ``, + template: ``, }) export class OpenaireResultComponent{ - piwikSiteId = properties.piwikSiteId; - } diff --git a/src/app/landingPages/service/service.component.ts b/src/app/landingPages/service/service.component.ts index f2c74cf..02d1802 100644 --- a/src/app/landingPages/service/service.component.ts +++ b/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: ``, + template: ``, }) export class OpenaireServiceComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - - } - - ngOnInit() { -} - - - } diff --git a/src/app/landingPages/software/software.component.ts b/src/app/landingPages/software/software.component.ts index f768724..408862f 100644 --- a/src/app/landingPages/software/software.component.ts +++ b/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: ``, + template: ``, }) export class OpenaireSoftwareComponent{ - piwikSiteId = properties.piwikSiteId; - - constructor ( ) { - } - - ngOnInit() { -} - - - } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 870ce71..2f98910 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 870ce718972596f5c36ae79271927c7f4279ff58 +Subproject commit 2f989107123ae674aba4907b113e4498a8f87786 diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts index 0bead0a..273155e 100644 --- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts +++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts @@ -8,7 +8,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc selector: 'openaire-advanced-search-dataprovider', template: ` + [hasPrefix]="false" [searchForm]="searchForm"> ` diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts index 1bef7d0..669edfc 100644 --- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts +++ b/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: ` - + ` diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts index b9ba48d..8dcc913 100644 --- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts +++ b/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: ` - + ` diff --git a/src/app/searchPages/advanced/advancedSearchServices.component.ts b/src/app/searchPages/advanced/advancedSearchServices.component.ts index 16a9f7d..e2932bb 100644 --- a/src/app/searchPages/advanced/advancedSearchServices.component.ts +++ b/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: ` - diff --git a/src/app/searchPages/advanced/searchResearchResults.component.ts b/src/app/searchPages/advanced/searchResearchResults.component.ts index 274ef16..c62e7fd 100644 --- a/src/app/searchPages/advanced/searchResearchResults.component.ts +++ b/src/app/searchPages/advanced/searchResearchResults.component.ts @@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc selector: 'openaire-search-results', template: ` + [hasPrefix]="false" [searchForm]="searchForm"> ` }) diff --git a/src/app/searchPages/find/search.component.ts b/src/app/searchPages/find/search.component.ts index 55e4c59..892084c 100644 --- a/src/app/searchPages/find/search.component.ts +++ b/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: ` - `, }) export class OpenaireSearchComponent{ - piwikSiteId = properties.piwikSiteId; public searchForm: SearchForm = {class: 'search-form', dark: true}; - constructor ( ) {} - ngOnInit() {} } diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts index 1afff3c..ecef3b8 100644 --- a/src/app/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/searchPages/simple/searchDataproviders.component.ts @@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-search-dataproviders', template: ` - + ` }) export class OpenaireSearchDataprovidersComponent { diff --git a/src/app/searchPages/simple/searchOrganizations.component.ts b/src/app/searchPages/simple/searchOrganizations.component.ts index b5dab2a..3a81d73 100644 --- a/src/app/searchPages/simple/searchOrganizations.component.ts +++ b/src/app/searchPages/simple/searchOrganizations.component.ts @@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-search-organizations', template: ` - + ` }) export class OpenaireSearchOrganizationsComponent { diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts index 2942bf2..b7c9d31 100644 --- a/src/app/searchPages/simple/searchProjects.component.ts +++ b/src/app/searchPages/simple/searchProjects.component.ts @@ -6,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-search-projects', template: ` - + ` }) export class OpenaireSearchProjectsComponent { diff --git a/src/app/searchPages/simple/searchResearchResults.component.ts b/src/app/searchPages/simple/searchResearchResults.component.ts index d581f8f..71238a5 100644 --- a/src/app/searchPages/simple/searchResearchResults.component.ts +++ b/src/app/searchPages/simple/searchResearchResults.component.ts @@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc selector: 'openaire-search-results', template: ` + [hasPrefix]="false" [searchForm]="searchForm"> ` }) export class OpenaireSearchResearchResultsComponent { diff --git a/src/app/searchPages/simple/searchServices.component.ts b/src/app/searchPages/simple/searchServices.component.ts index 22fe433..0e569f5 100644 --- a/src/app/searchPages/simple/searchServices.component.ts +++ b/src/app/searchPages/simple/searchServices.component.ts @@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc @Component({ selector: 'openaire-search-services', template: ` -