From a3647cd0ee98714e765be1ec1c53c53e88f8f1bb Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Fri, 16 Sep 2022 12:42:37 +0200
Subject: [PATCH] fix(annuaire): research fix with empty filter

---
 src/app/annuaire/annuaire.component.html                | 1 +
 src/app/annuaire/annuaire.component.ts                  | 6 ++++++
 src/app/annuaire/result-list/result-list.component.html | 2 +-
 src/app/annuaire/result-list/result-list.component.scss | 5 ++++-
 src/app/annuaire/result-list/result-list.component.ts   | 1 +
 src/app/annuaire/search-bar/search-bar.component.ts     | 2 +-
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/app/annuaire/annuaire.component.html b/src/app/annuaire/annuaire.component.html
index aeb7c003b..ffd9a8553 100644
--- a/src/app/annuaire/annuaire.component.html
+++ b/src/app/annuaire/annuaire.component.html
@@ -10,6 +10,7 @@
       [userList]="userList"
       [totalUserResult]="totalUserResult"
       [isLogged]="true"
+      [filterActive]="filterActive"
       (resetEvent)="shouldResetFilters()"
       (showMoreEvent)="showMore($event)"
     ></app-result-list>
diff --git a/src/app/annuaire/annuaire.component.ts b/src/app/annuaire/annuaire.component.ts
index 50902bda2..c8c1a5071 100644
--- a/src/app/annuaire/annuaire.component.ts
+++ b/src/app/annuaire/annuaire.component.ts
@@ -16,12 +16,18 @@ export class AnnuaireComponent implements OnInit {
   public totalUserResult: number;
   public resetFilters: number = 0;
   public nextPage: number = 1;
+  public filterActive: boolean = false;
 
   ngOnInit(): void {
     this.getUsers({ queryParam: '', page: 1, jobFilters: [], employerFilter: [] });
   }
   public getUsers(params: SearchQuery): void {
     if (this.userIsLoggedIn()) {
+      if (params.employerFilter?.length || params.jobFilters.length) {
+        this.filterActive = true;
+      } else {
+        this.filterActive = false;
+      }
       this.searchService
         .searchUserRegistry(params.queryParam, params.page, params.jobFilters, params.employerFilter)
         .subscribe((res: SearchResults) => {
diff --git a/src/app/annuaire/result-list/result-list.component.html b/src/app/annuaire/result-list/result-list.component.html
index 8560eed97..434d97ac2 100644
--- a/src/app/annuaire/result-list/result-list.component.html
+++ b/src/app/annuaire/result-list/result-list.component.html
@@ -1,4 +1,4 @@
-<div class="results notEmpty" *ngIf="isLogged && userList.length">
+<div class="results notEmpty" *ngIf="isLogged && userList.length" [ngClass]="{ filterActive: filterActive }">
   <div class="userNumber">
     {{ userList.length }} <span *ngIf="showPagination"> sur {{ totalUserResult }} </span> utilisateurs trouvés
   </div>
diff --git a/src/app/annuaire/result-list/result-list.component.scss b/src/app/annuaire/result-list/result-list.component.scss
index ffa95bc69..63d3022b6 100644
--- a/src/app/annuaire/result-list/result-list.component.scss
+++ b/src/app/annuaire/result-list/result-list.component.scss
@@ -34,7 +34,10 @@
   }
   &.notEmpty {
     //make sure it fits the correct height no matter the content lengtj and screen height
-    max-height: calc(100vh - $footer-height - $header-height - $header-height - 5rem);
+    max-height: calc(100vh - $footer-height - $header-height - $header-height - 2rem);
+    &.filterActive {
+      max-height: calc(100vh - $footer-height - $header-height - $header-height - 5rem);
+    }
     @media #{$large-phone} {
       height: 100%;
     }
diff --git a/src/app/annuaire/result-list/result-list.component.ts b/src/app/annuaire/result-list/result-list.component.ts
index 6cfcc547c..ed45d197e 100644
--- a/src/app/annuaire/result-list/result-list.component.ts
+++ b/src/app/annuaire/result-list/result-list.component.ts
@@ -13,6 +13,7 @@ export class ResultListComponent implements OnInit, OnChanges {
   @Input() userList: UserAnnuary[];
   @Input() totalUserResult: number;
   @Input() isLogged: boolean;
+  @Input() filterActive: boolean;
   @Output() resetEvent = new EventEmitter<any>();
   @Output() showMoreEvent = new EventEmitter<any>();
   public maxPerPage: number = 20;
diff --git a/src/app/annuaire/search-bar/search-bar.component.ts b/src/app/annuaire/search-bar/search-bar.component.ts
index e6d8ace01..57607b602 100644
--- a/src/app/annuaire/search-bar/search-bar.component.ts
+++ b/src/app/annuaire/search-bar/search-bar.component.ts
@@ -171,7 +171,7 @@ export class SearchBarComponent implements OnInit, OnChanges {
     this.splitFilters(this.checkedFilterList);
     this.countCheckedFilters();
     this.searchEvent.emit({
-      queryParam: inputTerm,
+      queryParam: inputTerm || '',
       jobFilters: this.checkedFilterList.length ? this.jobFilterChecked : [],
       employerFilter: this.checkedFilterList.length ? this.employerFilterChecked : [],
     });
-- 
GitLab