Merge pull request #530 from rahulramakrishnan3/release-3.0.0

bug fix 1403
ELEVATE-Project · Jul 23, 2024 · e095e0e · e095e0e
2 parents 2e6ecab + 4d37239
commit e095e0e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts
@@ -234,12 +234,13 @@ export class HomeSearchPage implements OnInit {
   }
 
   ionViewDidLeave(){
+    this.showSelectedCriteria = "";
     this.searchText = "";
     this.criteriaChip = "";
-    this.showSelectedCriteria = "";
     this.chips = [];
     this.utilService.subscribeSearchText('');
-    this.utilService.subscribeCriteriaChip('')
+    this.utilService.subscribeCriteriaChip('');
+    this.urlQueryData = null;
   }
 
   ngOnDestroy() {

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
@@ -54,7 +54,9 @@ export class MentorSearchDirectoryPage implements OnInit {
     private toast: ToastService
   ) { }
 
-  async ngOnInit() {
+  ngOnInit() { }
+
+  async ionViewWillEnter() {
     this.getMentors();
     this.permissionService.getPlatformConfig().then((config)=>{
       this.overlayChips = config?.result?.search_config?.search?.mentor?.fields;
@@ -191,8 +193,7 @@ export class MentorSearchDirectoryPage implements OnInit {
     this.showSelectedCriteria = "";
     this.selectedChipName = null;
     this.chips = [];
-    this.utilService.subscribeSearchText('');
-    this.utilService.subscribeCriteriaChip('')
+    this.urlQueryData = null;
   }
 
 }
diff --git a/src/app/pages/tabs/home/home.page.html b/src/app/pages/tabs/home/home.page.html
@@ -9,8 +9,8 @@ <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 [value]="searchText"
-        (keyup.enter)="search(q.value)">
+         [(ngModel)]="searchText"
+        (keyup.enter)="search(searchText)">
         </ion-searchbar>
       </div>
     <!--</ion-col>

diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts
@@ -52,12 +52,8 @@ export class HomePage implements OnInit {
   criteriaChip: any;
   searchText: string;
   constructor(
-    private http: HttpClient,
     private router: Router,
-    private navController: NavController,
     private profileService: ProfileService,
-    private loaderService: LoaderService,
-    private httpService: HttpService,
     private sessionService: SessionService,
     private modalController: ModalController,
     private userService: UserService,
@@ -157,8 +153,6 @@ export class HomePage implements OnInit {
     }else {
       this.toast.showToast("ENTER_MIN_CHARACTER","danger");
     }
-    this.criteriaChip = null;
-    this.searchText = null;
   }
   getUser() {
     this.profileService.profileDetails().then(data => {