From b357ff2ae203cf1336addea86314678d710006e3 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Wed, 7 Feb 2024 21:28:45 +0200
Subject: [PATCH] [develop | DONE | CHANGED]: Remove preselected "Open Access"
 filter from search. 1. home.component.ts: Set field "resultsQuickFilter" to
 null. 2. searchAll.component.ts: Set field "quickFilter" to null | In method
 "entityChanged()" do not set parameter "resultbestaccessright" | [BUG FIX]
 Clear subscriptions from fetchOrps. 3. searchResearchResults.component.ts:
 Set field "quickFilter" to null. 4. navigationBar.component.ts: Set field
 "resultsQuickFilter" to null. 5. app.component.ts: Remove
 "resultbestaccessright" parameter from menu items of Search research
 products.

---
 searchPages/find/searchAll.component.ts       | 20 +++++++++----------
 .../searchResearchResults.component.ts        | 12 +++++------
 sharedComponents/navigationBar.component.ts   | 12 +++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/searchPages/find/searchAll.component.ts b/searchPages/find/searchAll.component.ts
index c59d975a..cea70fd9 100644
--- a/searchPages/find/searchAll.component.ts
+++ b/searchPages/find/searchAll.component.ts
@@ -97,12 +97,12 @@ export class SearchAllComponent {
 
   subs: Subscription[] = [];
 
-  quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = {
-    filter: null,
-    selected: true,
-    filterId: "resultbestaccessright",
-    value: "Open Access"
-  };
+  quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = null;//{
+    // filter: null,
+    // selected: true,
+    // filterId: "resultbestaccessright",
+    // value: "Open Access"
+  // };
 
   resultTypes = {publication: true, dataset: true, software: true, other: true};
 
@@ -290,7 +290,7 @@ export class SearchAllComponent {
     this.fetchDatasets.clearSubscriptions();
     this.fetchPublications.clearSubscriptions();
     this.fetchSoftware.clearSubscriptions();
-    this.fetchPublications.clearSubscriptions();
+    this.fetchOrps.clearSubscriptions();
     this.fetchOrganizations.clearSubscriptions();
     this.fetchDataproviders.clearSubscriptions();
     this.fetchServices.clearSubscriptions();
@@ -603,9 +603,9 @@ export class SearchAllComponent {
       }
       if (entity == "result") {
         entity = "research-outcomes";
-        if(!!this.openAccess) {
-          this.parameters["resultbestaccessright"] = '"' + encodeURIComponent("Open Access") + '"';
-        }
+        // if(!!this.openAccess) {
+        //   this.parameters["resultbestaccessright"] = '"' + encodeURIComponent("Open Access") + '"';
+        // }
       }
       this.router.navigate(["/search/find", entity], {queryParams: this.parameters});
     }
diff --git a/searchPages/searchResearchResults.component.ts b/searchPages/searchResearchResults.component.ts
index 09fd44ba..00bc7bc2 100644
--- a/searchPages/searchResearchResults.component.ts
+++ b/searchPages/searchResearchResults.component.ts
@@ -91,12 +91,12 @@ export class SearchResearchResultsComponent {
   public orderedFields = this.searchFields.RESULT_FIELDS_ORDERED;
   @ViewChild(NewSearchPageComponent, { static: true }) searchPage: NewSearchPageComponent;
   @Input() simpleView: boolean = true;
-  quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = {
-    filter: null,
-    selected: true,
-    filterId: "resultbestaccessright",
-    value: "Open Access"
-  };
+  quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = null;//{
+    // filter: null,
+    // selected: true,
+    // filterId: "resultbestaccessright",
+    // value: "Open Access"
+  // };
   @Input() includeOnlyResultsAndFilter: boolean = false;
   @Input() showBreadcrumb: boolean = false;
   @Output() searchPageUpdates = new EventEmitter();
diff --git a/sharedComponents/navigationBar.component.ts b/sharedComponents/navigationBar.component.ts
index d2ed7fb6..7b30e85e 100644
--- a/sharedComponents/navigationBar.component.ts
+++ b/sharedComponents/navigationBar.component.ts
@@ -80,12 +80,12 @@ export class NavigationBarComponent implements OnInit, OnDestroy, OnChanges {
   public featuredAlignment: string = MenuAlignment.CENTER.valueOf();
 
   public hasSearchBar: boolean = false;
-  public resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = {
-    filter: null,
-    selected: true,
-    filterId: "resultbestaccessright",
-    value: "Open Access"
-  };
+  public resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = null;//{
+    // filter: null,
+    // selected: true,
+    // filterId: "resultbestaccessright",
+    // value: "Open Access"
+  // };
   @ViewChild('search_input') search_input: SearchInputComponent;
   @ViewChild('canvas') canvas: ElementRef;
   public routerHelper: RouterHelper = new RouterHelper();