MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Library|Trunk] 

apply in all pages domain and baseLink changes (part 2)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59413 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2020-09-18 10:10:18 +00:00
parent 7526ef56e3
commit 479a76b318
11 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
claims/claim-utils/claimContextSearchForm.component.ts
View File

@ -362,7 +362,7 @@ export class ClaimContextSearchFormComponent {
this.router.navigate(['/user-info'], {
queryParams: {
"errorCode": LoginErrorCodes.NOT_VALID,
"redirectUrl": this.properties.baseLink + this.router.url
"redirectUrl": this.properties.domain + this.properties.baseLink + this.router.url
}
});
}

2
landingPages/htmlProjectReport/htmlProjectReport.component.ts
View File

@ -91,7 +91,7 @@ export class HtmlProjectReportComponent {
this.properties = data.envSpecific;
//this.getDivContents();
this.getPageContents();
this.updateUrl(data.envSpecific.baseLink + this._router.url);
this.updateUrl(this.properties.domain + this.properties.baseLink + this._router.url);
this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink + this._router.url);
});

2
landingPages/organization/organization.component.html
View File

@ -14,7 +14,7 @@
<div *ngIf="organizationInfo != null" class="uk-grid uk-margin-remove">
<div class="uk-width-2-3@m uk-width-1-1@s uk-padding uk-padding-remove-left uk-padding-remove-vertical uk-margin-bottom">
<schema2jsonld *ngIf="organizationInfo" [data]=organizationInfo
[URL]="properties.domain + properties.baseLink+'/search/organization?organizationId='+organizationId"
[URL]="properties.domain + properties.baseLink+this.properties.searchLinkToOrganization+organizationId"
type="organization"></schema2jsonld>
<landing-header [properties]="properties" [title]="organizationInfo.title.name"
titleClass="uk-margin-remove-bottom"

2
landingPages/organization/organization.component.ts
View File

@ -148,7 +148,7 @@ export class OrganizationComponent {
}
//this.getDivContents();
this.getPageContents();
this.updateUrl(data.envSpecific.baseLink + this._router.url);
this.updateUrl(this.properties.domain + this.properties.baseLink + this._router.url);
});
this.sub = this.route.queryParams.subscribe(params => {
this.organizationInfo = null;

2
landingPages/project/project.component.ts
View File

@ -161,7 +161,7 @@ export class ProjectComponent {
}
//this.getDivContents();
this.getPageContents();
this.updateUrl(data.envSpecific.baseLink + this._router.url);
this.updateUrl(this.properties.domain + this.properties.baseLink + this._router.url);
});
this.sub = this.route.queryParams.subscribe(params => {

4
searchPages/find/search.component.ts
View File

@ -90,8 +90,8 @@ export class SearchComponent {
showProjects: boolean = false;
showDataProviders: boolean = false;
showOrganizations: boolean = false;
advancedSearchLink: string = "/search/advanced/publications";
properties: EnvProperties;
advancedSearchLink: string = this.properties.searchLinkToAdvancedResults;
@Input() logoURL;
@Input() name;
@Input() customFilter: SearchCustomFilter = null;
@ -128,7 +128,7 @@ export class SearchComponent {
var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
var title = "OpenAIRE | Search publications, research data, projects... | OpenAIRE";
this.properties = data.envSpecific;
var url = data.envSpecific.baseLink + this._router.url;
var url = this.properties.domain + this.properties.baseLink + this._router.url;
this._title.setTitle(title);
this._meta.updateTag({content: description}, "name='description'");
this._meta.updateTag({content: description}, "property='og:description'");

2
searchPages/find/searchAll.component.ts
View File

@ -147,7 +147,7 @@ export class SearchAllComponent {
var description = "Search for research outcomes (publications, datasets, software, other research products), projects, organizations, content providers in the OpenAIRE Research Graph. ";
var title = "OpenAIRE |Search for research outcomes, projects, content providers & organizations";
this.properties = data.envSpecific;
var url = data.envSpecific.baseLink + this._router.url;
var url = this.properties.domain + this.properties.baseLink + this._router.url;
this._title.setTitle(title);
this._meta.updateTag({content: description}, "name='description'");
this._meta.updateTag({content: description}, "property='og:description'");

6
searchPages/searchUtils/advancedSearchPage.component.ts
View File

@ -81,8 +81,8 @@ export class AdvancedSearchPageComponent {
this.csvLimit = data.envSpecific.csvLimit;
this.isPiwikEnabled = data.envSpecific.enablePiwikTrack;
if (typeof window !== 'undefined') {
this.updateUrl(data.envSpecific.baseLink + location.pathname);
this.url = data.envSpecific.baseLink + location.pathname
this.updateUrl(this.properties.domain + this.properties.baseLink + location.pathname);
this.url = this.properties.domain + this.properties.baseLink + location.pathname
}
if (typeof document !== 'undefined' && this.isPiwikEnabled) {
this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe();
@ -295,7 +295,7 @@ export class AdvancedSearchPageComponent {
/* Code For Piwik*/
if (typeof localStorage !== 'undefined') {
//console.log("In PreviousRouteRecorder : "+this.router.url );
localStorage.setItem('previousRoute', this.properties.baseLink + this.router.url);
localStorage.setItem('previousRoute', this.properties.domain + this.properties.baseLink + this.router.url);
}
if (this.isPiwikEnabled && (typeof document !== 'undefined')) {
this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe();

2
searchPages/searchUtils/searchPage.component.ts
View File

@ -106,7 +106,7 @@ export class SearchPageComponent {
this.csvLimit = data.envSpecific.csvLimit;
this.isPiwikEnabled = data.envSpecific.enablePiwikTrack;
if(typeof window !== 'undefined') {
this.updateUrl(data.envSpecific.baseLink+location.pathname);
this.updateUrl(this.properties.domain + this.properties.baseLink+location.pathname);
}
if(typeof document !== 'undefined' && this.isPiwikEnabled){
this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe();

4
searchPages/searchUtils/searchPageTableView.component.ts
View File

@ -98,8 +98,8 @@ export class SearchPageTableViewComponent implements OnInit, AfterViewInit {
this.getPageContents();
this.isPiwikEnabled = data.envSpecific.enablePiwikTrack;
if(typeof window !== 'undefined') {
this.updateUrl(data.envSpecific.baseLink+location.pathname);
this.url =data.envSpecific.baseLink+location.pathname;
this.updateUrl(this.properties.domain+this.properties.baseLink+location.pathname);
this.url =this.properties.domain+this.properties.baseLink+location.pathname;
}
if(typeof document !== 'undefined' && this.isPiwikEnabled){
this.piwiksub = this._piwikService.trackView(data.envSpecific, this.pageTitle, this.piwikSiteId).subscribe();

4
utils/piwik/previousRouteRecorder.guard.ts
View File

@ -12,8 +12,8 @@ export class PreviousRouteRecorder implements CanDeactivate<any> {
}
canDeactivate(component: any): Observable<boolean> | boolean {
if (typeof localStorage !== 'undefined') {
// console.log("In PreviousRouteRecorder : "+properties.baseLink + this.router.url );
localStorage.setItem('previousRoute', properties.baseLink + this.router.url);
// console.log("In PreviousRouteRecorder : "properties.domain +properties.baseLink + this.router.url );
localStorage.setItem('previousRoute', properties.domain + properties.baseLink + this.router.url);
}
return true;
}