From c22e64c46ca48652bef2c6538bbd6f97678233ee Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Wed, 16 Sep 2020 13:50:16 +0000 Subject: [PATCH] [Library|Trunk] update meta urls and canonicalurl to get domain from properties instead of baseLink to work for community gateways git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59403 d315682c-612b-4755-9ff5-7f18f6832af3 --- deposit/depositFirstPage.component.ts | 2 +- error/errorPage.component.ts | 2 +- landingPages/dataProvider/dataProvider.component.ts | 6 +++--- .../htmlProjectReport/htmlProjectReport.component.ts | 2 +- landingPages/organization/organization.component.ts | 4 ++-- landingPages/project/project.component.ts | 6 +++--- landingPages/result/resultLanding.component.ts | 6 +++--- searchPages/find/search.component.ts | 2 +- searchPages/find/searchAll.component.ts | 2 +- searchPages/searchUtils/advancedSearchPage.component.ts | 2 +- searchPages/searchUtils/newSearchPage.component.ts | 2 +- searchPages/searchUtils/searchPage.component.ts | 2 +- searchPages/searchUtils/searchPageTableView.component.ts | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/deposit/depositFirstPage.component.ts b/deposit/depositFirstPage.component.ts index cf50dc18..0f9652c7 100644 --- a/deposit/depositFirstPage.component.ts +++ b/deposit/depositFirstPage.component.ts @@ -241,7 +241,7 @@ export class DepositFirstPageComponent { this.route.data .subscribe((data: { envSpecific: EnvProperties }) => { this.properties = data.envSpecific; - this.url = this.properties.baseLink+this._router.url; + this.url = this.properties.domain+this._router.url; this.seoService.createLinkForCanonicalURL(this.url, false); var description = "Find the appropriate repository or journal or use Zenodo repository to deposit your research and publish in the Open Access journals that suit your needs."; diff --git a/error/errorPage.component.ts b/error/errorPage.component.ts index 895c0338..61b79bda 100644 --- a/error/errorPage.component.ts +++ b/error/errorPage.component.ts @@ -63,7 +63,7 @@ export class ErrorPageComponent { this.route.data .subscribe((data: { envSpecific: EnvProperties }) => { let properties = data.envSpecific; - this.seoService.createLinkForCanonicalURL(properties.baseLink + "/error"); + this.seoService.createLinkForCanonicalURL(properties.domain + "/error"); this.route.queryParams.subscribe(data => { this.page = data['page']; diff --git a/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts index 5ebcc7d6..50679486 100644 --- a/landingPages/dataProvider/dataProvider.component.ts +++ b/landingPages/dataProvider/dataProvider.component.ts @@ -161,7 +161,7 @@ export class DataProviderComponent { } //this.getDivContents(); this.getPageContents(); - this.updateUrl(this.properties.baseLink + this._router.url); + this.updateUrl(this.properties.domain + this._router.url); this.sub = this.route.queryParams.subscribe(data => { this.updateTitle("Content provider"); this.updateDescription(""); @@ -247,7 +247,7 @@ export class DataProviderComponent { this.subInfo = this._dataproviderService.getDataproviderInfo(this.datasourceId, this.properties).subscribe( data => { this.dataProviderInfo = data; - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this._router.url); if (typeof document !== 'undefined') { this.getDataProviderAggregationStatus(this.dataProviderInfo.originalId); } else { @@ -282,7 +282,7 @@ export class DataProviderComponent { } this.errorMessage = 'No dataProvider found'; this.showLoading = false; - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.properties.searchLinkToDataProviders); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.searchLinkToDataProviders); } ); } diff --git a/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/landingPages/htmlProjectReport/htmlProjectReport.component.ts index 32aa29cf..81d074f6 100644 --- a/landingPages/htmlProjectReport/htmlProjectReport.component.ts +++ b/landingPages/htmlProjectReport/htmlProjectReport.component.ts @@ -92,7 +92,7 @@ export class HtmlProjectReportComponent { //this.getDivContents(); this.getPageContents(); this.updateUrl(data.envSpecific.baseLink + this._router.url); - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this._router.url); }); this.sub = this.route.queryParams.subscribe(params => { diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts index 790113ee..2a7a1c29 100644 --- a/landingPages/organization/organization.component.ts +++ b/landingPages/organization/organization.component.ts @@ -333,7 +333,7 @@ export class OrganizationComponent { this.errorMessage = 'No organization found'; } else { this.organizationInfo = data; - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.properties.searchLinkToOrganization + this.organizationInfo.relcanId); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.searchLinkToOrganization + this.organizationInfo.relcanId); this.updateTitle((this.organizationInfo.title.name?this.organizationInfo.title.name:(this.organizationInfo.name?this.organizationInfo.name:'No title available'))); this.updateDescription("Organization, country, " + (this.organizationInfo.title.name?this.organizationInfo.title.name:'No title available') + @@ -364,7 +364,7 @@ export class OrganizationComponent { } }); } - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.properties.searchLinkToOrganizations); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.searchLinkToOrganizations); this.errorMessage = 'No organization found'; this.showLoading = false; } diff --git a/landingPages/project/project.component.ts b/landingPages/project/project.component.ts index ecfa2ac2..afd2def0 100644 --- a/landingPages/project/project.component.ts +++ b/landingPages/project/project.component.ts @@ -356,7 +356,7 @@ export class ProjectComponent { if(err.status == 404) { this._router.navigate(['/error'], {queryParams: {"page": this._location.path(true), "page_type": "project"}}); } - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.properties.searchLinkToProjects); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.searchLinkToProjects); this.errorMessage = 'No project found'; this.showLoading = false; } @@ -385,7 +385,7 @@ export class ProjectComponent { if(err.status == 404) { this._router.navigate(['/error'], {queryParams: {"page": this._location.path(true), "page_type": "project"}}); } - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.properties.searchLinkToProjects); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.searchLinkToProjects); this.errorMessage = 'No project found'; this.showLoading = false; } @@ -397,7 +397,7 @@ export class ProjectComponent { if (this.projectName == undefined || this.projectName == '') { this.projectName = this.projectInfo.title; } - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this._router.url); this.updateTitle(this.projectName); this.updateDescription(this.projectInfo.description?this.projectInfo.description: ("project" + (this.projectInfo.title?"," + this.projectInfo.title:"") + (this.projectInfo.funding && this.projectInfo.funding.funderName?", funder: " + this.projectInfo.funding.funderName:"") + (this.projectInfo.acronym?"," + this.projectInfo.acronym:""))); if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index 107450e1..80889d54 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -129,7 +129,7 @@ export class ResultLandingComponent { } //this.getDivContents(); this.getPageContents(); - this.updateUrl(this.properties.baseLink + this._router.url); + this.updateUrl(this.properties.domain + this._router.url); this.sub = this.route.queryParams.subscribe(data => { this.resultLandingInfo = null; if (data['articleId']) { @@ -321,7 +321,7 @@ export class ResultLandingComponent { if (this.type == "result") { // no type was specified - update URL based this.resultLandingInfo.resultType this.updateUrlWithType(); } - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.linkToLandingPage + this.resultLandingInfo.relcanId); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this.linkToLandingPage + this.resultLandingInfo.relcanId); if ((this.type == "publication") && (this.properties.environment == "beta" || this.properties.environment == "development") && (typeof document !== 'undefined')) { this.getOpenCitations(); } @@ -369,7 +369,7 @@ export class ResultLandingComponent { this.errorMessage += "No research product found"; } this.showLoading = false; - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.linkToSearchPage); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this.linkToSearchPage); } ); } diff --git a/searchPages/find/search.component.ts b/searchPages/find/search.component.ts index 18aa3df9..6eee824e 100644 --- a/searchPages/find/search.component.ts +++ b/searchPages/find/search.component.ts @@ -134,7 +134,7 @@ export class SearchComponent { this._meta.updateTag({content: description}, "property='og:description'"); this._meta.updateTag({content: title}, "property='og:title'"); this._meta.updateTag({content: url}, "property='og:url'"); - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url, false); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this._router.url, false); if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE |Search publications, research data, projects...", this.piwikSiteId).subscribe()); diff --git a/searchPages/find/searchAll.component.ts b/searchPages/find/searchAll.component.ts index 7347d43a..7860263b 100644 --- a/searchPages/find/searchAll.component.ts +++ b/searchPages/find/searchAll.component.ts @@ -153,7 +153,7 @@ export class SearchAllComponent { this._meta.updateTag({content: description}, "property='og:description'"); this._meta.updateTag({content: title}, "property='og:title'"); this._meta.updateTag({content: url}, "property='og:url'"); - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url, false); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this._router.url, false); if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { this.subs.push(this._piwikService.trackView(this.properties, title, this.piwikSiteId).subscribe()); diff --git a/searchPages/searchUtils/advancedSearchPage.component.ts b/searchPages/searchUtils/advancedSearchPage.component.ts index bfb24954..3f7beb9f 100644 --- a/searchPages/searchUtils/advancedSearchPage.component.ts +++ b/searchPages/searchUtils/advancedSearchPage.component.ts @@ -97,7 +97,7 @@ export class AdvancedSearchPageComponent { this.searchUtils.baseUrl = "/" + this.searchUtils.baseUrl; this.updateBaseUrlWithParameters(); - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.router.url, false); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this.router.url, false); } diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index 70600901..cfb93967 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -173,7 +173,7 @@ export class NewSearchPageComponent { } this.searchUtils.baseUrl = "/" + this.searchUtils.baseUrl; - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.router.url, false); + this.seoService.createLinkForCanonicalURL(this.properties.domain + this.router.url, false); this.breadcrumbs.push({name: 'home', route: '/'}); if(this.simpleView) { this.breadcrumbs.push( {name: "Search", route: null}); diff --git a/searchPages/searchUtils/searchPage.component.ts b/searchPages/searchUtils/searchPage.component.ts index 70737920..98f513b8 100644 --- a/searchPages/searchUtils/searchPage.component.ts +++ b/searchPages/searchUtils/searchPage.component.ts @@ -117,7 +117,7 @@ export class SearchPageComponent { this.updateTitle(this.pageTitle); var description = "Openaire, search, repositories, open access, type, content provider, funder, project, " + this.type + "," +this.pageTitle; this.updateDescription(description); - this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this.router.url,false); + this.seoService.createLinkForCanonicalURL(this.properties.domain+this.router.url,false); } private getPageContents() { diff --git a/searchPages/searchUtils/searchPageTableView.component.ts b/searchPages/searchUtils/searchPageTableView.component.ts index 68d3c98f..4846de59 100644 --- a/searchPages/searchUtils/searchPageTableView.component.ts +++ b/searchPages/searchUtils/searchPageTableView.component.ts @@ -114,7 +114,7 @@ export class SearchPageTableViewComponent implements OnInit, AfterViewInit { this.updateTitle(this.pageTitle); var description = "Openaire, search, repositories, open access, type, content provider, funder, project, " + this.type + "," +this.pageTitle; this.updateDescription(description); - this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this.router.url,false); + this.seoService.createLinkForCanonicalURL(this.properties.domain+this.router.url,false); this.breadcrumbs.push({name: 'home', route: '/'}, {name: this.pageTitle, route: null});