Merged PR 901: #2080 Suchbegriff bei Filter zurücksetzen beibehalten

Related work items: #2080

apps/page/catalog/src/lib/article-search/article-search.store.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { DomainCatalogService } from '@domain/catalog';
 import { Observable, Subject } from 'rxjs';
-import { debounceTime, filter, map, shareReplay, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import { debounceTime, map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
 
 import { UiFilter } from '@ui/filter';
 import { ComponentStore, tapResponse } from '@ngrx/component-store';
@@ -77,12 +77,16 @@ export class ArticleSearchService extends ComponentStore<ArticleSearchState> {
     this.patchState({ hits });
   }
 
-  async setDefaultFilter() {
+  async setDefaultFilter(defaultQueryParams?: Record<string, string>) {
     const filter = await this.catalog
       .getSettings()
       .pipe(map((settings) => UiFilter.create(settings)))
       .toPromise();
 
+    if (!!defaultQueryParams) {
+      filter?.fromQueryParams(defaultQueryParams);
+    }
+
     this.setFilter(filter);
   }
 

apps/page/catalog/src/lib/article-search/search-filter/search-filter.component.html

@@ -11,7 +11,7 @@
   </div>
 
   <div class="cta-wrapper">
-    <button class="cta-reset-filter" (click)="resetFilter()">
+    <button class="cta-reset-filter" (click)="resetFilter(filter)">
       Filter zurücksetzen
     </button>
 

apps/page/catalog/src/lib/article-search/search-filter/search-filter.component.ts

@@ -50,7 +50,8 @@ export class ArticleSearchFilterComponent implements OnInit {
     });
   }
 
-  resetFilter() {
-    this.articleSearch.setDefaultFilter();
+  resetFilter(value: UiFilter) {
+    const queryParams = { main_qs: value?.getQueryParams()?.main_qs || '' };
+    this.articleSearch.setDefaultFilter(queryParams);
   }
 }

apps/page/goods-in/src/lib/goods-in-search/goods-in-search-filter/goods-in-search-filter.component.ts

@@ -50,7 +50,8 @@ export class GoodsInSearchFilterComponent implements OnInit, OnDestroy {
   }
 
   async resetFilter() {
-    this._goodsInSearchStore.resetFilter();
+    const queryParams = { main_qs: this.filter?.getQueryParams()?.main_qs || '' };
+    this._goodsInSearchStore.resetFilter(queryParams);
     this._initSettings();
     this._cdr.markForCheck();
   }

apps/page/goods-in/src/lib/goods-in-search/goods-in-search.store.ts

@@ -102,8 +102,14 @@ export class GoodsInSearchStore extends ComponentStore<GoodsInSearchState> {
     }
   }
 
-  resetFilter() {
-    this.setFilter(UiFilter.create(this.defaultSettings));
+  resetFilter(defaultQueryParams?: Record<string, string>) {
+    const filter = UiFilter.create(this.defaultSettings);
+
+    if (!!defaultQueryParams) {
+      filter?.fromQueryParams(defaultQueryParams);
+    }
+
+    this.setFilter(filter);
   }
 
   clearResults() {

apps/page/goods-out/src/lib/goods-out-search/goods-out-search-filter/goods-out-search-filter.component.ts

@@ -51,7 +51,8 @@ export class GoodsOutSearchFilterComponent implements OnInit, OnDestroy {
   }
 
   async resetFilter() {
-    this._goodsOutSearchStore.resetFilter();
+    const queryParams = { main_qs: this.filter?.getQueryParams()?.main_qs || '' };
+    this._goodsOutSearchStore.resetFilter(queryParams);
     this._initSettings();
     this._cdr.markForCheck();
   }

apps/page/goods-out/src/lib/goods-out-search/goods-out-search.store.ts

@@ -106,8 +106,14 @@ export class GoodsOutSearchStore extends ComponentStore<GoodsOutSearchState> {
     }
   }
 
-  resetFilter() {
-    this.setFilter(UiFilter.create(this.defaultSettings));
+  resetFilter(defaultQueryParams?: Record<string, string>) {
+    const filter = UiFilter.create(this.defaultSettings);
+
+    if (!!defaultQueryParams) {
+      filter?.fromQueryParams(defaultQueryParams);
+    }
+
+    this.setFilter(filter);
   }
 
   clearResults() {