cleanup + Property images

bizmatch/src/app/pages/listings/business-listings/business-listings.component.ts

@@ -10,13 +10,12 @@ import { InputTextModule } from 'primeng/inputtext';
 import { PaginatorModule } from 'primeng/paginator';
 import { StyleClassModule } from 'primeng/styleclass';
 import { ToggleButtonModule } from 'primeng/togglebutton';
-import { BusinessListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
+import { BusinessListing } from '../../../../../../bizmatch-server/src/models/db.model';
 import { ListingCriteria, ListingType } from '../../../../../../bizmatch-server/src/models/main.model';
 import { environment } from '../../../../environments/environment';
 import { ImageService } from '../../../services/image.service';
 import { ListingsService } from '../../../services/listings.service';
 import { SelectOptionsService } from '../../../services/select-options.service';
-import { UserService } from '../../../services/user.service';
 import { createGenericObject, getCriteriaStateObject, getSessionStorageHandler } from '../../../utils/utils';
 
 @Component({
@@ -29,7 +28,6 @@ import { createGenericObject, getCriteriaStateObject, getSessionStorageHandler }
 export class BusinessListingsComponent {
   environment = environment;
   listings: Array<BusinessListing>;
-  users: Array<User>;
   filteredListings: Array<BusinessListing>;
   criteria: ListingCriteria;
   realEstateChecked: boolean;
@@ -37,7 +35,6 @@ export class BusinessListingsComponent {
   minPrice: string;
   type: string;
   states = [];
-  statesSet = new Set();
   state: string;
   first: number = 0;
   rows: number = 12;
@@ -48,7 +45,6 @@ export class BusinessListingsComponent {
   constructor(
     public selectOptions: SelectOptionsService,
     private listingsService: ListingsService,
-    private userService: UserService,
     private activatedRoute: ActivatedRoute,
     private router: Router,
     private cdRef: ChangeDetectorRef,
@@ -68,30 +64,14 @@ export class BusinessListingsComponent {
   }
   async ngOnInit() {}
   async init() {
-    this.users = [];
-    this.listings = await this.listingsService.getListings(this.criteria, 'business');
-
-    this.setStates();
-    //this.filteredListings=[...this.listings];
-    this.totalRecords = this.listings.length;
-    //this.filteredListings=[...this.listings].splice(this.first,this.rows);
-    this.cdRef.markForCheck();
-    this.cdRef.detectChanges();
-  }
-  setStates() {
-    this.statesSet = new Set();
-    this.listings.forEach(l => {
-      if (l.state) {
-        this.statesSet.add(l.state);
-      }
-    });
-    this.states = [...this.statesSet].map(ls => ({ name: this.selectOptions.getState(ls as string), value: ls }));
+    const statesResult = await this.listingsService.getAllStates('business');
+    this.states = statesResult.map(s => s.state).map(ls => ({ name: this.selectOptions.getState(ls as string), value: ls }));
+    this.search();
   }
   async search() {
-    this.listings = await this.listingsService.getListings(this.criteria, 'business');
-    this.setStates();
-    this.totalRecords = this.listings.length;
-    this.filteredListings = [...this.listings].splice(this.first, this.rows);
+    const listingReponse = await this.listingsService.getListings(this.criteria, 'business');
+    this.listings = listingReponse.data;
+    this.totalRecords = listingReponse.total;
     this.cdRef.markForCheck();
     this.cdRef.detectChanges();
   }
@@ -100,6 +80,7 @@ export class BusinessListingsComponent {
     this.criteria.length = event.rows;
     this.criteria.page = event.page;
     this.criteria.pageCount = event.pageCount;
+    this.search();
   }
   imageErrorHandler(listing: ListingType) {
     // listing.hideImage = true; // Bild ausblenden, wenn es nicht geladen werden kann