From b9bc9bac42327a4c83a8e201415fbd1117b410c0 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Thu, 28 Jul 2022 20:35:22 +0300
Subject: [PATCH] remove search service from popup filters

---
 .../popup-filter/popup-filter.component.ts    | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/lib/filtering/popup-filter/popup-filter.component.ts b/src/lib/filtering/popup-filter/popup-filter.component.ts
index 0270e9a..19fd9eb 100644
--- a/src/lib/filtering/popup-filter/popup-filter.component.ts
+++ b/src/lib/filtering/popup-filter/popup-filter.component.ts
@@ -4,8 +4,6 @@ import { delay, map } from 'rxjs/operators';
 import { any, shareDistinctLast, shareLast } from '../../utils';
 import { FilterService } from '../filter.service';
 import { IFilterGroup } from '../models/filter-group.model';
-import { SearchService } from '../../search';
-import { Filter, IFilter } from '..';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 
 @Component({
@@ -13,7 +11,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
     templateUrl: './popup-filter.component.html',
     styleUrls: ['./popup-filter.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    providers: [SearchService],
 })
 export class PopupFilterComponent implements OnInit {
     @Input() primaryFiltersSlug!: string;
@@ -28,10 +25,9 @@ export class PopupFilterComponent implements OnInit {
 
     primaryFilterGroup$!: Observable<IFilterGroup | undefined>;
     secondaryFilterGroup$!: Observable<IFilterGroup | undefined>;
-    primaryFilters$!: Observable<IFilter[] | undefined>;
     primaryFiltersDisabled$!: Observable<boolean>;
 
-    constructor(readonly filterService: FilterService, readonly searchService: SearchService<Filter>) {}
+    constructor(readonly filterService: FilterService) {}
 
     private get _hasActiveFilters$() {
         return combineLatest([this.primaryFilterGroup$, this.secondaryFilterGroup$]).pipe(
@@ -41,24 +37,15 @@ export class PopupFilterComponent implements OnInit {
         );
     }
 
-    private get _primaryFilters$(): Observable<IFilter[]> {
-        return combineLatest([this.primaryFilterGroup$, this.searchService.valueChanges$]).pipe(
-            map(([group]) => this.searchService.searchIn(group?.filters ?? [])),
-            shareLast(),
-        );
-    }
-
     private get _primaryFiltersDisabled$(): Observable<boolean> {
-        return combineLatest([this.primaryFilterGroup$, this.primaryFilters$, this.searchService.valueChanges$]).pipe(
-            map(([group, filters, value]) => [!!group?.filterceptionPlaceholder, filters?.length === 0, value === '']),
-            map(([hasFilterSearch, noFilters, searchIsEmpty]) => noFilters && (!hasFilterSearch || (hasFilterSearch && searchIsEmpty))),
+        return this.primaryFilterGroup$.pipe(
+            map(group => group?.filters?.length === 0),
             shareDistinctLast(),
         );
     }
 
     ngOnInit(): void {
         this.primaryFilterGroup$ = this.filterService.getGroup$(this.primaryFiltersSlug).pipe(shareLast());
-        this.primaryFilters$ = this._primaryFilters$;
         this.secondaryFilterGroup$ = this.filterService.getGroup$(this.secondaryFiltersSlug).pipe(shareLast());
 
         this.hasActiveFilters$ = this._hasActiveFilters$;