Revert "home page search works to return both hubs and events"

This reverts commit 6ae121b.

Author: shoshannaTM

src/app/home/home.page.html

@@ -24,36 +24,7 @@
 
 <ion-content fullscreen="true">
 
-    <ion-searchbar (ionInput)="searchHubsAndEvents($event)" showCancelButton="focus"></ion-searchbar>
-
-    <ion-list *ngIf="filter !== ''">
-      <ion-list-header>
-        <ion-text>Results</ion-text>
-      </ion-list-header>
-
-      <ion-item lines="none" *ngIf="!filteredSearchResults?.length">
-        <ion-label>No matches.</ion-label>
-      </ion-item>
-
-      <ng-container *ngFor="let item of filteredSearchResults;">
-        <ng-container [ngSwitch]="item.kind">
-
-          <app-hub-card *ngSwitchCase="'hub'"
-            [hub]="item.hub"
-            [coords]="locationService.location"
-            (click)="goToHubPage(item.id)">
-          </app-hub-card>
-
-          <app-event-card *ngSwitchCase="'event'"
-            [userEvent]="item.userEvent"
-            [buttons]="false"
-            (click)="navCtrl.navigateForward('tabs/event/' + item.id)">
-          </app-event-card>
-
-        </ng-container>
-      </ng-container>
-</ion-list>
-
+    <ion-searchbar (ionInput)="filterHubs($event)" showCancelButton="focus"></ion-searchbar>
 
     <ion-card style="height:30%" (click)="goToMap()">
       <app-maplibre 
@@ -69,7 +40,7 @@
 
       <app-claim-your-account-dialog />
 
-      <ion-list>
+      <ion-list *ngIf="filter === ''">
         <ion-list-header>
           <ion-text>Upcoming Events</ion-text>
         </ion-list-header>
@@ -86,7 +57,7 @@
 
         <ion-grid class="ion-no-padding">
           <ion-row>
-            <ion-col size="12" size-md="6" *ngFor="let userEvent of upcomingEvents;">
+            <ion-col size="12" size-md="6" *ngFor="let userEvent of upcomingEvents; trackBy: trackByEvent">
               <app-event-card
               [userEvent]="userEvent"
               [buttons]="false"
@@ -108,7 +79,7 @@
         </div>
     </ion-list>
 
-      <ion-list>
+      <ion-list *ngIf="filter === ''">
           <ion-list-header>
               <ion-text>Hubs</ion-text>
           </ion-list-header>
@@ -134,6 +105,21 @@
           </div>
       </ion-list>
 
+      <ion-list *ngIf="filter !== ''">
+        <ion-list-header>
+            <ion-text>Hubs</ion-text>
+        </ion-list-header>
+        <div *ngFor="let userHub of filteredUserHubs; trackBy: userTrackByHub">
+          <app-hub-card
+          [hub]="userHub.hub"
+          [coords]="locationService.location"
+          [starred]="userHub.starred"
+          [muted]="userHub.muted"
+          [isOwner]="userHub.isOwner"
+          (click)="goToHubPage(userHub.hubId)"></app-hub-card>
+        </div>
+    </ion-list>
+
       <ion-fab vertical="bottom" horizontal="end" slot="fixed">
         <ion-fab-button>
           <ion-icon name="add-outline"></ion-icon>

src/app/home/home.page.ts

@@ -3,7 +3,7 @@ import { Config, MenuController, NavController } from '@ionic/angular';
 import { QueryRef } from 'apollo-angular';
 import { NGXLogger } from 'ngx-logger';
 import { Subscription } from 'rxjs';
-import { Hub, InvitesByUserGQL, InvitesByUserQuery, JoinUserEvent, JoinUserHub, QuerySearchHubByNameArgs, User, UserEventsGQL, UserEventsQuery, UsersHubsGQL, UsersHubsQuery } from 'src/graphql/graphql';
+import { Hub, InvitesByUserGQL, InvitesByUserQuery, JoinUserHub, User, UserEventsGQL, UserEventsQuery, UsersHubsGQL, UsersHubsQuery } from 'src/graphql/graphql';
 import { environment } from '../../environments/environment';
 import { MaplibreComponent } from '../components/maplibre/maplibre.component';
 import { AuthService } from '../services/auth/auth.service';
@@ -13,15 +13,6 @@ import { LocationService } from '../services/location/location.service';
 import { ThemeService } from '../services/theme/theme.service';
 import { ApolloQueryResult } from '@apollo/client/core';
 
-type SearchHubItem   = UsersHubsQuery['usersHubs'][number];
-type SearchEventItem = UserEventsQuery['usersEvents'][number];
-
-type SearchResults =
-  | { kind: 'hub';   id: number; name: string; raw: SearchHubItem;   hub: Hub }
-  | { kind: 'event'; id: number; name: string; raw: SearchEventItem; userEvent: SearchEventItem };
-
-
-
 @Component({
   selector: 'app-home',
   templateUrl: 'home.page.html',
@@ -36,9 +27,6 @@ export class HomePage implements OnInit, OnDestroy {
   invites: InvitesByUserQuery['invitesByUser'];
   filter = '';
   filteredUserHubs: UsersHubsQuery['usersHubs'];
-
-  filteredSearchResults: SearchResults[] = [];
-
   userHubs: UsersHubsQuery['usersHubs'];
   hubs: Hub[] = [];
   user: User;
@@ -167,41 +155,15 @@ export class HomePage implements OnInit, OnDestroy {
     this.navCtrl.navigateForward('settings');
   }
 
-  searchHubsAndEvents(ev: any) {
-      this.filter = ev.target.value;
+  filterHubs(ev: any) {
+    this.filter = ev.target.value;
 
     if (this.filter && this.filter.trim() !== '') {
-
       this.filteredUserHubs = this.userHubs.filter(y => {
         const name = y.hub.name.trim().toLowerCase();
         return name.includes(this.filter.trim().toLowerCase());
       });
-
-      this.filteredEvents = this.sortedEvents?.filter(x => {
-        const name = x?.event?.name?.trim()?.toLowerCase();
-        return name?.includes(this.filter?.trim()?.toLowerCase());
-      }).sort(
-        (a, b) => new Date(b?.event?.startDateTime).valueOf() - new Date(a?.event?.startDateTime).valueOf()
-      );
-
-       const hubResults: SearchResults[] = this.filteredUserHubs.map((uh) => ({
-          kind: 'hub',
-          id: Number(uh?.hub?.id),
-          name: uh?.hub?.name ?? '',
-          raw: uh,
-          hub: uh?.hub as Hub,
-        }));
-
-        const eventResults: SearchResults[] = this.filteredEvents.map((ue) => ({
-          kind: 'event',
-          id: Number(ue?.event?.id),
-          name: ue?.event?.name ?? '',
-          raw: ue,
-          userEvent: ue,
-        }));
-
-      this.filteredSearchResults = [...hubResults, ...eventResults];
-    }   
+    }
   }
 
   goToMap() {