From ef742be1b236e84d7fc7819acbbf5679f9726db5 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 8 May 2023 17:10:51 +0300
Subject: [PATCH] [Library | explore-redesign]: Added/ updated how filters
 appear in mobile screens | Updated search forms. 1. general.less: Added fixed
 position for .filters-toggle-button. 2. newSearchPage.component.html: Added
 floating button for filters in mobile screens. 3.
 advancedSearchForm.component.html: Re-introduced commented out
 <entities-selection> inside <advanced-search-input> | Removed iconPosition
 and commented button for filters inside search form. 4. home.module.ts:
 Imported SearchInputModule. 5. home.component.html: Replaced
 <advanced-search-input> with <div search-input> 6.
 searchDataProviders.component.ts: Set entitiesSelection to false for
 <new-search-page> 7. newSearchPage.component.ts & searchAll.component.html:
 Set entitiesSelection to false for <advanced-search-form>

---
 searchPages/find/searchAll.component.html     |  2 +-
 searchPages/searchDataProviders.component.ts  |  2 +-
 .../advancedSearchForm.component.html         | 26 +++++++++----------
 .../searchUtils/newSearchPage.component.html  | 10 ++++++-
 .../searchUtils/newSearchPage.component.ts    |  2 +-
 5 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/searchPages/find/searchAll.component.html b/searchPages/find/searchAll.component.html
index 51873f56..5eef267a 100644
--- a/searchPages/find/searchAll.component.html
+++ b/searchPages/find/searchAll.component.html
@@ -15,7 +15,7 @@
               [isDisabled]="disableForms"
               [simpleView]="true" [formPlaceholderText]="formPlaceholderText"
               [selectedFields]="selectedFields" [showSwitchSearchLink]="true" [dark]="searchForm.dark"
-              [fieldIdsMap]="fieldIdsMap" [fieldIds]="fieldIds" [entitiesSelection]="true" [customFilter]="customFilter"
+              [fieldIdsMap]="fieldIdsMap" [fieldIds]="fieldIds" [entitiesSelection]="false" [customFilter]="customFilter"
             >
             </advanced-search-form>
           </div>
diff --git a/searchPages/searchDataProviders.component.ts b/searchPages/searchDataProviders.component.ts
index 40dd7ca5..8dad1735 100644
--- a/searchPages/searchDataProviders.component.ts
+++ b/searchPages/searchDataProviders.component.ts
@@ -35,7 +35,7 @@ import {properties} from "../../../environments/environment";
       [includeOnlyResultsAndFilter]="includeOnlyResultsAndFilter"
       [piwikSiteId]=piwikSiteId [hasPrefix]="hasPrefix"
       [searchForm]="searchForm"
-      [entitiesSelection]="type=='all' || type == 'services'"  [showSwitchSearchLink]="showSwitchSearchLink"  
+      [entitiesSelection]="false"  [showSwitchSearchLink]="showSwitchSearchLink"  
       [filters]="filters"
       [simpleView]="simpleView" formPlaceholderText="Search by name, description, subject..." 
       [showResultCount]="true" [showIndexInfo]="type!='deposit'"
diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html
index e9d954f3..530475f7 100644
--- a/searchPages/searchUtils/advancedSearchForm.component.html
+++ b/searchPages/searchUtils/advancedSearchForm.component.html
@@ -164,28 +164,28 @@
     <div class="uk-flex uk-flex-center uk-child-width-1-1">
       <ng-container *ngIf="entitiesSelection">
         <!-- [class.uk-hidden]="disableSelect" -->
-        <advanced-search-input [dark]="dark" [iconPosition]="isMobile?'left':'right'" [disabled]="isDisabled" (searchEmitter)="simpleKeywordChanged()">
-          <!-- <entities-selection [simpleView]="true" [currentEntity]="entityType"
+        <advanced-search-input [dark]="dark" [disabled]="isDisabled" (searchEmitter)="simpleKeywordChanged()">
+          <entities-selection [simpleView]="true" [currentEntity]="entityType"
                               (selectionChange)="simpleEntityChanged($event)" (disableSelectEmitter)="disableSelectChange($event)"
                               [onChangeNavigate]="true" [customFilter]="customFilter" class="uk-width-2-5"></entities-selection> -->
           <div class="uk-width-expand" input placeholder="Search in Explore" [searchable]="true" [hint]="formPlaceholderText"
                [(value)]="selectedFields[0].value" tooltip="true"></div>
-          <a *ngIf="isMobile" href="#mobile-filters" filters-toggle (click)="filtersClicked.emit(true)" uk-toggle>
-            <icon name="filters"></icon>
-          </a>
+<!--          <a *ngIf="isMobile" href="#mobile-filters" filters-toggle (click)="filtersClicked.emit(true)" uk-toggle>-->
+<!--            <icon name="filters"></icon>-->
+<!--          </a>-->
         </advanced-search-input>
         <div *ngIf="selectedFields[0] && disableSelect" search-input [disabled]="isDisabled" [(value)]="selectedFields[0].value"
-             [placeholder]="formPlaceholderText" (searchEmitter)="simpleKeywordChanged()" [iconPosition]="isMobile?'left':'right'">
-			<a *ngIf="isMobile" href="#mobile-filters" filters-toggle (click)="filtersClicked.emit(true)" uk-toggle>
-				<icon name="filters"></icon>
-			</a>
+             [placeholder]="formPlaceholderText" (searchEmitter)="simpleKeywordChanged()">
+<!--			<a *ngIf="isMobile" href="#mobile-filters" filters-toggle (click)="filtersClicked.emit(true)" uk-toggle>-->
+<!--				<icon name="filters"></icon>-->
+<!--			</a>-->
 		</div>
       </ng-container>
       <div *ngIf="selectedFields[0] && !entitiesSelection" search-input [disabled]="isDisabled" [(value)]="selectedFields[0].value"
-           [placeholder]="formPlaceholderText" (searchEmitter)="simpleKeywordChanged()" [iconPosition]="isMobile?'left':'right'">
-				<a *ngIf="isMobile" href="#mobile-filters" filters-toggle (click)="filtersClicked.emit(true)" uk-toggle>
-					<icon name="filters"></icon>
-				</a>
+           [placeholder]="formPlaceholderText" (searchEmitter)="simpleKeywordChanged()">
+<!--				<a *ngIf="isMobile" href="#mobile-filters" filters-toggle (click)="filtersClicked.emit(true)" uk-toggle>-->
+<!--					<icon name="filters"></icon>-->
+<!--				</a>-->
 			</div>
     </div>
   </div>
diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index c441ff44..b0e333a2 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -139,6 +139,14 @@
   </div>
 </ng-template>
 <ng-template #main let-mobile="mobile">
+  <div *ngIf="mobile" class="filters-toggle-button">
+    <button href="#mobile-filters" uk-toggle="target: #mobile-filters"
+            class="uk-icon-button uk-button-secondary uk-flex uk-flex-middle"
+            (click)="showOffCanvas = true" [disabled]="disabled" [class.uk-disabled]="disabled">
+      <icon name="filters" [flex]="true" ratio="1.2" visuallyHidden="filters"></icon>
+    </button>
+  </div>
+
   <!-- TODO - Clean up -->
   <div *ngIf="!includeOnlyResultsAndFilter" [class]="usedBy != 'deposit' && usedBy != 'orcid' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
 		(stickyForm?'':'  ') :
@@ -171,7 +179,7 @@
                                     [advancedSearchLinkParameters]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)"
                                     [simpleView]="simpleView" [formPlaceholderText]="formPlaceholderText" [isMobile]="mobile"
                                     [resultTypes]="resultTypes" [quickFilter]="quickFilter" [entitiesSelection]="entitiesSelection"
-                                    [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilter" (filtersClicked)="showOffCanvas = $event"
+                                    [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilter"
               >
               </advanced-search-form>
             </div>
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts
index 83aa9045..dfda1d97 100644
--- a/searchPages/searchUtils/newSearchPage.component.ts
+++ b/searchPages/searchUtils/newSearchPage.component.ts
@@ -132,7 +132,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   public pageOptions: number[] = [5, 10, 20, 50];
   @Input() basicMetaDescription = [];
   
-  @Input() entitiesSelection: boolean = true;
+  @Input() entitiesSelection: boolean = false;
   @Input() showSwitchSearchLink: boolean = true;
   
   // on 1st load, do not show filters until results query returns.