bugFixes

bizmatch/src/app/components/search-modal/search-modal.component.ts

@@ -1,6 +1,7 @@
 import { AsyncPipe, NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { NgSelectModule } from '@ng-select/ng-select';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { catchError, concat, debounceTime, distinctUntilChanged, map, Observable, of, Subject, Subscription, switchMap, tap } from 'rxjs';
 import { BusinessListingCriteria, CommercialPropertyListingCriteria, CountyResult, GeoResult, KeyValue, KeyValueStyle, UserListingCriteria } from '../../../../../bizmatch-server/src/models/main.model';
 import { CriteriaChangeService } from '../../services/criteria-change.service';
@@ -10,7 +11,7 @@ import { SelectOptionsService } from '../../services/select-options.service';
 import { UserService } from '../../services/user.service';
 import { SharedModule } from '../../shared/shared/shared.module';
 import { ModalService } from './modal.service';
-
+@UntilDestroy()
 @Component({
   selector: 'app-search-modal',
   standalone: true,
@@ -38,10 +39,15 @@ export class SearchModalComponent {
   ) {}
   ngOnInit() {
     this.setupCriteriaChangeListener();
-    this.modalService.message$.subscribe(msg => {
+    this.modalService.message$.pipe(untilDestroyed(this)).subscribe(msg => {
       this.criteria = msg;
       this.setTotalNumberOfResults();
     });
+    this.modalService.modalVisible$.pipe(untilDestroyed(this)).subscribe(val => {
+      if (val) {
+        this.criteria.page = 1;
+      }
+    });
     this.loadCities();
     this.loadCounties();
   }