From b14f76c2b06854b7f2a9e028ce4b148634bc95d0 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 24 May 2023 12:36:22 +0300
Subject: [PATCH 1/4] Entities selection: Initialize entities array to empty
 before add entities.

---
 searchPages/searchUtils/entitiesSelection.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/searchPages/searchUtils/entitiesSelection.component.ts b/searchPages/searchUtils/entitiesSelection.component.ts
index 8b3759d2..f51dd8ad 100644
--- a/searchPages/searchUtils/entitiesSelection.component.ts
+++ b/searchPages/searchUtils/entitiesSelection.component.ts
@@ -56,6 +56,7 @@ export class EntitiesSelectionComponent {
               showPage["" + data['pages'][i]["route"] + ""] = data['pages'][i]["isEnabled"];
             }
           }
+          this.entities = [];
           if(this.onlyresults) {
             if(this.simpleView) {
               this.entities.push({label: 'All ' + OpenaireEntities.RESULTS.toLowerCase(), value: 'all'});
-- 
2.17.1


From e6974dfd0f989955999f7ccffa19e2e266867723 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 24 May 2023 14:31:08 +0300
Subject: [PATCH 2/4] Disable cookie in server for connect production.

---
 http-interceptor.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http-interceptor.service.ts b/http-interceptor.service.ts
index dadd3781..dab01120 100644
--- a/http-interceptor.service.ts
+++ b/http-interceptor.service.ts
@@ -36,7 +36,7 @@ export class HttpInterceptorService implements HttpInterceptor {
     } else {
       if (isPlatformServer(this.platformId)) {
         let headers = new HttpHeaders();
-        if(request.withCredentials) {
+        if(request.withCredentials && (properties.dashboard !== 'connect' || properties.environment !== 'production')) {
           headers = headers.set('Cookie', this.req.get('Cookie'));
         }
         const authReq = request.clone({
-- 
2.17.1


From 956d1f2c3f403a97d526879aa8c9bafe944a08d3 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 25 May 2023 10:02:05 +0300
Subject: [PATCH 3/4] Navbar: Logo add small class if logoInfo exists.

---
 sharedComponents/navigationBar.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html
index 611a4716..5ce946ca 100644
--- a/sharedComponents/navigationBar.component.html
+++ b/sharedComponents/navigationBar.component.html
@@ -317,7 +317,7 @@
 </div>
 <ng-template #header_template let-mobile="mobile">
   <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)"
            [src]="!mobile?activeHeader.logoUrl:activeHeader.logoSmallUrl"
            [alt]="activeHeader.title">
@@ -329,7 +329,7 @@
     </ng-container>
   </a>
   <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)"
          [src]="!mobile?activeHeader.logoUrl:activeHeader.logoSmallUrl"
          [alt]="activeHeader.title">
-- 
2.17.1


From 39a7ed58be27513c05598edc18cf095eb5b044c5 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 25 May 2023 16:37:12 +0300
Subject: [PATCH 4/4] Properties: add hasMachineCache in order to use cookie or
 not.

---
 http-interceptor.service.ts        | 2 +-
 utils/properties/env-properties.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/http-interceptor.service.ts b/http-interceptor.service.ts
index dab01120..bdc3d3bd 100644
--- a/http-interceptor.service.ts
+++ b/http-interceptor.service.ts
@@ -36,7 +36,7 @@ export class HttpInterceptorService implements HttpInterceptor {
     } else {
       if (isPlatformServer(this.platformId)) {
         let headers = new HttpHeaders();
-        if(request.withCredentials && (properties.dashboard !== 'connect' || properties.environment !== 'production')) {
+        if(request.withCredentials && !properties.hasMachineCache) {
           headers = headers.set('Cookie', this.req.get('Cookie'));
         }
         const authReq = request.clone({
diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts
index f0f7aacf..baed70d1 100644
--- a/utils/properties/env-properties.ts
+++ b/utils/properties/env-properties.ts
@@ -144,4 +144,5 @@ export interface EnvProperties {
   connectPortalUrl?;
   eoscDataTransferAPI?;
   eoscDataTransferDestinations?;
+  hasMachineCache?: boolean;
 }
-- 
2.17.1