From 72a47d8899db12c8fe75bb53f9d3003b3d666d80 Mon Sep 17 00:00:00 2001
From: Rahul K R <rahul@tunerlabs.com>
Date: Mon, 22 Jul 2024 18:53:44 +0530
Subject: [PATCH] bug fix 1403

---
 src/app/pages/home-search/home-search.page.ts         |  4 +++-
 .../mentor-search-directory.page.html                 |  2 +-
 .../mentor-search-directory.page.ts                   |  9 +++++++++
 src/app/pages/tabs/home/home.page.html                |  2 +-
 src/app/pages/tabs/home/home.page.ts                  | 11 ++++++++++-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts
index d952f032..649eac7e 100644
--- a/src/app/pages/home-search/home-search.page.ts
+++ b/src/app/pages/home-search/home-search.page.ts
@@ -233,11 +233,13 @@ export class HomeSearchPage implements OnInit {
     }
   }
 
-  ionViewWillLeave(){
+  ionViewDidLeave(){
     this.searchText = "";
     this.criteriaChip = "";
     this.showSelectedCriteria = "";
     this.chips = [];
+    this.utilService.subscribeSearchText('');
+    this.utilService.subscribeCriteriaChip('')
   }
   
   ngOnDestroy() {
diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html
index 1c0337ed..4f6f9a39 100644
--- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html
+++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html
@@ -1,7 +1,7 @@
 <app-page-header [config]="headerConfig">
   <div class="d-flex flex-justify-center">
     <ion-searchbar class="top-padding search-style"  debounce="1000" placeholder="{{'MENTOR_SEARCH_PLACEHOLDER' | translate}}"
-    #event
+    #event [value]="searchText"
     (keyup.enter)="onSearch(event.value)"
     cdkOverlayOrigin #trigger="cdkOverlayOrigin" (click)="isOpen = !isOpen"></ion-searchbar>
   </div>
diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts
index 8476e4f6..1958f8cf 100644
--- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts
+++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts
@@ -186,4 +186,13 @@ export class MentorSearchDirectoryPage implements OnInit {
     }
   }
 
+  ionViewDidLeave(){
+    this.searchText = "";
+    this.showSelectedCriteria = "";
+    this.selectedChipName = null;
+    this.chips = [];
+    this.utilService.subscribeSearchText('');
+    this.utilService.subscribeCriteriaChip('')
+  }
+
 }
diff --git a/src/app/pages/tabs/home/home.page.html b/src/app/pages/tabs/home/home.page.html
index aaa1bf82..406fad22 100644
--- a/src/app/pages/tabs/home/home.page.html
+++ b/src/app/pages/tabs/home/home.page.html
@@ -9,7 +9,7 @@ <h3>
       <div class="d-flex flex-justify-center my-8">
         <ion-searchbar class="search-bar" placeholder="{{'HOME_SEARCH_PLACEHOLDER' | translate}}"
          cdkOverlayOrigin #trigger="cdkOverlayOrigin" (click)="isOpen = !isOpen"
-         #q
+         #q [value]="searchText"
         (keyup.enter)="search(q.value)">
         </ion-searchbar>
       </div>
diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts
index fb8bbeae..2cae6f89 100644
--- a/src/app/pages/tabs/home/home.page.ts
+++ b/src/app/pages/tabs/home/home.page.ts
@@ -50,6 +50,7 @@ export class HomePage implements OnInit {
 
   chips= [];
   criteriaChip: any;
+  searchText: string;
   constructor(
     private http: HttpClient,
     private router: Router,
@@ -149,13 +150,15 @@ export class HomePage implements OnInit {
   search(event: string) {
     this.isOpen = false;
     if(event && event.length >= 3){
-      this.utilService.subscribeSearchText(event);
+      this.searchText = event ? event : "";
+      this.utilService.subscribeSearchText(this.searchText);
       this.utilService.subscribeCriteriaChip(JSON.stringify(this.criteriaChip))
       this.router.navigate([`/${CommonRoutes.HOME_SEARCH}`]);
     }else {
       this.toast.showToast("ENTER_MIN_CHARACTER","danger");
     }
     this.criteriaChip = null;
+    this.searchText = null;
   }
   getUser() {
     this.profileService.profileDetails().then(data => {
@@ -227,4 +230,10 @@ export class HomePage implements OnInit {
       this.criteriaChip = chip;
     }
   }
+
+  ionViewDidLeave(){
+    this.criteriaChip = '';
+    this.searchText = '';
+  }
+
 }