Reset all filters on destroying a table or a card component (eclipse-…

…esmf#109)
bci-oss · Jul 25, 2024 · ca3ac94 · ca3ac94
1 parent de4083a
commit ca3ac94
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/...components/card/generators/components/card/files/__name@dasherize__.component.ts.template b/...components/card/generators/components/card/files/__name@dasherize__.component.ts.template
@@ -369,8 +369,8 @@ export class <%= classify(name) %>Component implements OnInit, AfterViewInit<% i
 
     <% if (options.enableRemoteDataHandling || options.hasSearchBar ) { %>
         ngOnDestroy() {
-            <% if (options.hasSearchBar) { %>
-                this.filterService.searchString.setValue('');
+            <% if (options.hasSearchBar || options.isEnumQuickFilter || options.isDateQuickFilter) { %>
+                this.filterService.reset();
             <% } %>
 
             this.destroy$.next();

diff --git a/...nts/shared/generators/services/filter/files/__name@dasherize__-filter.service.ts.template b/...nts/shared/generators/services/filter/files/__name@dasherize__-filter.service.ts.template
@@ -174,6 +174,14 @@ export class <%= classify(name) %>FilterService {
     <% } %>
 
     <% if (options.hasSearchBar || options.isEnumQuickFilter || options.isDateQuickFilter) { %>
+        reset(): void {
+            const appliedFilters = [...this.activeFilters];
+
+            appliedFilters.forEach((filter) => {
+                this.resetFilter(filter)
+            })
+        }
+
         /** Removes a specific filter. */
         removeFilter(filter:FilterType) {
             switch(filter.type) {

diff --git a/...mponents/table/generators/components/table/files/__name@dasherize__.component.ts.template b/...mponents/table/generators/components/table/files/__name@dasherize__.component.ts.template
@@ -307,7 +307,9 @@ export class <%= classify(name) %>Component implements OnInit, AfterViewInit, Af
 
     <% if (options.hasSearchBar || options.enableRemoteDataHandling) { %>
         ngOnDestroy(): void {
-            <% if (options.hasSearchBar) { %>this.filterService.searchString.setValue('');<% } %>
+            <% if (options.hasSearchBar || options.isEnumQuickFilter || options.isDateQuickFilter) { %>
+                this.filterService.reset();
+            <% } %>
             this.ngUnsubscribe.next();
             this.ngUnsubscribe.complete();
         }