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

Merge pull request 'Connect release 25th May 2023' (#5) from develop into master 

Reviewed-on: #5
This commit is contained in:
Konstantinos Triantafyllou 2023-05-25 16:10:42 +02:00
parent ab47a86892 39a7ed58be
commit d4103354aa
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
http-interceptor.service.ts
View File

@ -36,7 +36,7 @@ export class HttpInterceptorService implements HttpInterceptor {
} else { } else {
if (isPlatformServer(this.platformId)) { if (isPlatformServer(this.platformId)) {
let headers = new HttpHeaders(); let headers = new HttpHeaders();
if(request.withCredentials) { if(request.withCredentials && !properties.hasMachineCache) {
headers = headers.set('Cookie', this.req.get('Cookie')); headers = headers.set('Cookie', this.req.get('Cookie'));
} }
const authReq = request.clone({ const authReq = request.clone({

1
searchPages/searchUtils/entitiesSelection.component.ts
View File

@ -56,6 +56,7 @@ export class EntitiesSelectionComponent {
showPage["" + data['pages'][i]["route"] + ""] = data['pages'][i]["isEnabled"]; showPage["" + data['pages'][i]["route"] + ""] = data['pages'][i]["isEnabled"];
} }
} }
this.entities = [];
if(this.onlyresults) { if(this.onlyresults) {
if(this.simpleView) { if(this.simpleView) {
this.entities.push({label: 'All ' + OpenaireEntities.RESULTS.toLowerCase(), value: 'all'}); this.entities.push({label: 'All ' + OpenaireEntities.RESULTS.toLowerCase(), value: 'all'});

4
sharedComponents/navigationBar.component.html
View File

@ -317,7 +317,7 @@
</div> </div>
<ng-template #header_template let-mobile="mobile"> <ng-template #header_template let-mobile="mobile">
<a *ngIf="!activeHeader.url" [routerLink]="activeHeader.route" [class.uk-padding-remove]="!isHeaderLeft" <a *ngIf="!activeHeader.url" [routerLink]="activeHeader.route" [class.uk-padding-remove]="!isHeaderLeft"
class="uk-logo uk-navbar-item uk-flex uk-flex-middle"> class="uk-logo uk-navbar-item uk-flex uk-flex-middle" [class.small]="activeHeader.logoInfo">
<img *ngIf="(mobile && activeHeader.logoSmallUrl) || (!mobile && activeHeader.logoUrl)" <img *ngIf="(mobile && activeHeader.logoSmallUrl) || (!mobile && activeHeader.logoUrl)"
[src]="!mobile?activeHeader.logoUrl:activeHeader.logoSmallUrl" [src]="!mobile?activeHeader.logoUrl:activeHeader.logoSmallUrl"
[alt]="activeHeader.title"> [alt]="activeHeader.title">
@ -329,7 +329,7 @@
</ng-container> </ng-container>
</a> </a>
<a *ngIf="activeHeader.url" [href]="activeHeader.url" [class.uk-padding-remove]="!isHeaderLeft" <a *ngIf="activeHeader.url" [href]="activeHeader.url" [class.uk-padding-remove]="!isHeaderLeft"
class="uk-logo uk-navbar-item uk-flex uk-flex-middle"> class="uk-logo uk-navbar-item uk-flex uk-flex-middle" [class.small]="activeHeader.logoInfo">
<img *ngIf="(mobile && activeHeader.logoSmallUrl) || (!mobile && activeHeader.logoUrl)" <img *ngIf="(mobile && activeHeader.logoSmallUrl) || (!mobile && activeHeader.logoUrl)"
[src]="!mobile?activeHeader.logoUrl:activeHeader.logoSmallUrl" [src]="!mobile?activeHeader.logoUrl:activeHeader.logoSmallUrl"
[alt]="activeHeader.title"> [alt]="activeHeader.title">

1
utils/properties/env-properties.ts
View File

@ -144,4 +144,5 @@ export interface EnvProperties {
connectPortalUrl?; connectPortalUrl?;
eoscDataTransferAPI?; eoscDataTransferAPI?;
eoscDataTransferDestinations?; eoscDataTransferDestinations?;
hasMachineCache?: boolean;
} }