From cdddec692524d4852e9cae79887bc70ac692e6af Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Tue, 13 Feb 2024 16:07:43 +0200
Subject: [PATCH] [develop | DONE | FIXED] Search page: extra fixes for custom
 filter

---
 searchPages/searchUtils/newSearchPage.component.html | 5 +++--
 searchPages/searchUtils/newSearchPage.component.ts   | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index e52de3b5..51dc82fa 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -228,7 +228,8 @@
   </div>
 
   <!-- TODO - Clean up -->
-  <div *ngIf="!includeOnlyResultsAndFilter" [class]="usedBy != 'deposit' && usedBy != 'orcid' && (!customFilters || customFilters[0].queryFieldName != 'communityId') ?
+  <div *ngIf="!includeOnlyResultsAndFilter" [class]="usedBy != 'deposit' && usedBy != 'orcid' &&
+   (!customFilters || (customFilters && customFilters[0].queryFieldName != 'communityId')) ?
 		(stickyForm?'':'  ') :
     (+ (stickyForm?'':' uk-section') +' uk-padding-remove-bottom  uk-padding-remove-top ' +
     ((usedBy == 'deposit' || usedBy == 'orcid') ? ' uk-padding-remove-top ' : ' '))"
@@ -260,7 +261,7 @@
                                     [advancedSearchLinkParameters]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)"
                                     [simpleView]="simpleView" [formPlaceholderText]="formPlaceholderText" [isMobile]="mobile"
                                     [resultTypes]="resultTypes" [quickFilter]="quickFilter" [entitiesSelection]="entitiesSelection"
-                                    [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilters[0]"
+                                    [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilters?customFilters[0]:null"
               >
               </advanced-search-form>
             </div>
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts
index 01bb1acf..5f62d7d6 100644
--- a/searchPages/searchUtils/newSearchPage.component.ts
+++ b/searchPages/searchUtils/newSearchPage.component.ts
@@ -73,7 +73,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   @Input()
   set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) {
     if(!Array.isArray(customFilter)) {
-      this.customFilters = [customFilter];
+      this.customFilters = customFilter?[customFilter]:null;
     }else{
       this.customFilters = customFilter;
     }
@@ -234,14 +234,14 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   }
   
   private getPageContents() {
-    this.subscriptions.push(this.helper.getPageHelpContents(this.properties, (this.customFilters[0] && this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
+    this.subscriptions.push(this.helper.getPageHelpContents(this.properties, (this.customFilters && this.customFilters[0] && this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
       this.pageContents = contents;
     }));
     
   }
   
   private getDivContents() {
-    this.subscriptions.push(this.helper.getDivHelpContents(this.properties, (this.customFilters[0] &&  this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
+    this.subscriptions.push(this.helper.getDivHelpContents(this.properties, (this.customFilters && this.customFilters[0] &&  this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
       this.divContents = contents;
     }));
   }